From 53d0b61088553533a96404dc1282eab32f26f19f Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Thu, 27 Dec 2018 16:08:17 +0100 Subject: [PATCH] when adding overlay doesn't succeed due to privilege problems error message is improved --- frontend-js/src/main/js/ServerConnector.js | 2 +- frontend-js/src/main/js/gui/AddOverlayDialog.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js index 5f7b42280d..03c38e3237 100644 --- a/frontend-js/src/main/js/ServerConnector.js +++ b/frontend-js/src/main/js/ServerConnector.js @@ -2056,7 +2056,7 @@ ServerConnector.addOverlay = function (params) { return self.sendPostRequest(self.addOverlayUrl(queryParams), data); }).then(function (content) { return new DataOverlay(JSON.parse(content)); - }); + }).catch(self.processNetworkError); }; /** diff --git a/frontend-js/src/main/js/gui/AddOverlayDialog.js b/frontend-js/src/main/js/gui/AddOverlayDialog.js index 1754a7c1ed..4d5d4b6fd6 100644 --- a/frontend-js/src/main/js/gui/AddOverlayDialog.js +++ b/frontend-js/src/main/js/gui/AddOverlayDialog.js @@ -7,6 +7,7 @@ var GuiConnector = require('../GuiConnector'); var GuiUtils = require('./leftPanel/GuiUtils'); var DataOverlay = require('../map/data/DataOverlay'); var NetworkError = require('../NetworkError'); +var SecurityError = require('../SecurityError'); var OverlayParser = require('../map/OverlayParser'); @@ -290,6 +291,8 @@ AddOverlayDialog.prototype.open = function () { if (error instanceof NetworkError && error.statusCode === HttpStatus.BAD_REQUEST) { var errorMessage = JSON.parse(error.content); GuiConnector.alert("Problematic input: <br/>" + errorMessage.reason); + } else if (error instanceof SecurityError) { + GuiConnector.alert("You cannot add more overlays"); } else { GuiConnector.alert(error); } -- GitLab