Commit d7e9aad5 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1121-remove-overlay-twice' into 'devel_14.0.x'

don't allow to remove data overlay twice

See merge request !1065
parents 9170c859 e3b27d47
Pipeline #21406 passed with stage
in 15 minutes and 27 seconds
...@@ -6,6 +6,8 @@ minerva (14.0.9) stable; urgency=medium ...@@ -6,6 +6,8 @@ minerva (14.0.9) stable; urgency=medium
* Bug fix: transparent complexes are shown with wrong color (#1103) * Bug fix: transparent complexes are shown with wrong color (#1103)
* Bug fix: CellDesigner sometimes marked reduced notation reaction as * Bug fix: CellDesigner sometimes marked reduced notation reaction as
reversible even though they were not visualized so (#1109) reversible even though they were not visualized so (#1109)
* Bug fix: when data overlay was being removed user could request to remove
overlay second time and an error was thrown (#1121)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 3 Feb 2020 15:00:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Mon, 3 Feb 2020 15:00:00 +0200
......
...@@ -422,9 +422,12 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) { ...@@ -422,9 +422,12 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) {
message: "Do you want to delete overlay: " + overlay.getName() + "?" message: "Do you want to delete overlay: " + overlay.getName() + "?"
}).then(function (confirmation) { }).then(function (confirmation) {
if (confirmation) { if (confirmation) {
GuiConnector.showProcessing("Removing");
return self.removeOverlay(overlay).then(function () { return self.removeOverlay(overlay).then(function () {
$(windowSelf).dialog("close"); $(windowSelf).dialog("close");
}).catch(GuiConnector.alert); }).catch(GuiConnector.alert).finally(function () {
GuiConnector.hideProcessing();
});
} }
}); });
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment