From 1dc5c450eeea39f8afb335bf9456fc5ed0c89caa Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 28 Aug 2019 18:39:38 +0200
Subject: [PATCH] when reloading page due to anonymous login, don't create
admin page
---
frontend-js/src/main/js/minerva.js | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 15f20b4ad3..434cfcc31a 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -890,17 +890,20 @@ function createAdmin(params) {
ServerConnector.getSessionData(null).getLogin() === null ||
ServerConnector.getSessionData(null).getLogin() === undefined) {
window.location.href = ServerConnector.getServerBaseUrl() + "login.xhtml?from=" + encodeURI(window.location.href);
+ return Promise.resolve();
}
return ServerConnector.getConfiguration();
}).then(function (configuration) {
- params.setConfiguration(configuration);
- result = new Admin(params);
- return createFooter();
- }).then(function (footer) {
- params.getElement().appendChild(footer);
- return result.init();
- }).then(function () {
- return result;
+ if (configuration !== undefined) {
+ params.setConfiguration(configuration);
+ result = new Admin(params);
+ return createFooter().then(function (footer) {
+ params.getElement().appendChild(footer);
+ return result.init();
+ }).then(function () {
+ return result;
+ });
+ }
});
}
--
GitLab