Skip to content
Snippets Groups Projects
Commit 57d429dd authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '611-custom-overlays' into 'devel_12.1.x'

Resolve "disable "Add overlay" button or improve error message `403` when number of custom layout is greater equal `CUSTOM_LAYOUTS`"

See merge request !572
parents 4be85dca f2ae74c7
No related branches found
No related tags found
2 merge requests!573Merge 12.1.5 into master,!572Resolve "disable "Add overlay" button or improve error message `403` when number of custom layout is greater equal `CUSTOM_LAYOUTS`"
Pipeline #8149 passed
minerva (12.1.5) stable; urgency=medium
* Bug fix: Drugbank changed output format which crashed drug connector
* Bug fix: word wrapping fixed in overlay table for long overlay names
in Firefox browser
-- Piotr Gawron <piotr.gawron@uni.lu> Fri, 10 Janc 2019 14:00:00 +0200
minerva (12.1.4) stable; urgency=medium minerva (12.1.4) stable; urgency=medium
* Bug fix: no check for limit on custom data overlays fixed * Bug fix: no check for limit on custom data overlays fixed
* Bug fix: error message improved when there is privilege problem during * Bug fix: error message improved when there is privilege problem during
......
...@@ -292,7 +292,7 @@ AddOverlayDialog.prototype.open = function () { ...@@ -292,7 +292,7 @@ AddOverlayDialog.prototype.open = function () {
var errorMessage = JSON.parse(error.content); var errorMessage = JSON.parse(error.content);
GuiConnector.alert("Problematic input: <br/>" + errorMessage.reason); GuiConnector.alert("Problematic input: <br/>" + errorMessage.reason);
} else if (error instanceof SecurityError) { } else if (error instanceof SecurityError) {
GuiConnector.alert("You cannot add more overlays"); GuiConnector.alert("You cannot add more overlays, Custom Overlay limit is reached.");
} else { } else {
GuiConnector.alert(error); GuiConnector.alert(error);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment