From 70fb5ed77aa45693c64c47c704395d0c0101c4c9 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 27 Dec 2018 15:15:37 +0100
Subject: [PATCH] adding overlay from admin panel raised exception
---
frontend-js/src/main/js/gui/admin/EditProjectDialog.js | 7 +++++--
.../src/test/js/gui/admin/EditProjectDialog-test.js | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 4226657fa6..4d46be2614 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -1033,7 +1033,7 @@ EditProjectDialog.prototype.removeOverlay = function (overlayId) {
/**
*
- * @returns {Promise}
+ * @returns {Promise<AddOverlayDialog>}
*/
EditProjectDialog.prototype.openAddOverlayDialog = function () {
var self = this;
@@ -1044,13 +1044,16 @@ EditProjectDialog.prototype.openAddOverlayDialog = function () {
project: self.getProject(),
customMap: null,
element: document.createElement("div"),
- configuration: self.getConfiguration()
+ configuration: self.getConfiguration(),
+ serverConnector: self.getServerConnector()
});
self._addOverlayDialog.addListener("onAddOverlay", function () {
return self.refreshOverlays();
});
return self._addOverlayDialog.init().then(function () {
return self._addOverlayDialog.open();
+ }).then(function(){
+ return self._addOverlayDialog;
});
};
diff --git a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
index 63ef99e951..dea7260b7d 100644
--- a/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
+++ b/frontend-js/src/test/js/gui/admin/EditProjectDialog-test.js
@@ -122,8 +122,11 @@ describe('EditProjectDialog', function () {
return createDialog().then(function (result) {
dialog = result;
return dialog.openAddOverlayDialog();
+ }).then(function (overlayDialog) {
+ overlayDialog.setFileContent("X");
+ return $("button:contains('UPLOAD')").click();
}).then(function () {
- dialog.destroy();
+ return dialog.destroy();
});
});
--
GitLab