Skip to content

Commit

Permalink
bring back tram code from merge contflick fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sasuolanderSito committed Oct 16, 2023
1 parent 8acbaef commit 7032c36
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions UI/src/view/point_asset/massTransitStopForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var poistaSelected = false;
var authorizationPolicy;
var pointAssetToSave = false;
var tramStopToSave = false;

var rootElement = $("#feature-attributes");

Expand Down Expand Up @@ -130,6 +131,11 @@
selectedMassTransitStopModel.deleteMassTransitStop(poistaSelected);
}
});
} else if(tramStopToSave) {
new GenericConfirmPopup('Oletko varma, että haluat luoda pysäkin kävelyn ja pyöräilyn väylälle?', {
successCallback: function () {
saveStop();
}});
} else if (pointAssetToSave) {
saveWithPossibleWalkingCyclingPopUp();
} else {
Expand Down Expand Up @@ -1098,6 +1104,10 @@
pointAssetToSave = true;
}

if (property.publicId === "pysakin_tyyppi" && _.some(property.values, function (value) {return value.propertyValue === 1;})) {
tramStopToSave = true;
}

});

eventbus.on('busStop:selected', function(value) {
Expand Down

0 comments on commit 7032c36

Please sign in to comment.