diff --git a/frontend-js/src/main/js/Admin.js b/frontend-js/src/main/js/Admin.js
index 6ac40c9a77f87afd7e0b35c6eb1ce7e9e12d22f2..656928f3739ec63ca44935c5bd50e9b9a10cb0d1 100644
--- a/frontend-js/src/main/js/Admin.js
+++ b/frontend-js/src/main/js/Admin.js
@@ -5,7 +5,6 @@
var Promise = require("bluebird");
var CustomMapOptions = require('./map/CustomMapOptions');
-var Header = require('./gui/Header');
var GuiUtils = require('./gui/leftPanel/GuiUtils');
var ObjectWithListeners = require('./ObjectWithListeners');
@@ -45,16 +44,6 @@ Admin.prototype.constructor = ObjectWithListeners;
Admin.prototype._createGui = function () {
var self = this;
self.getElement().innerHTML = "";
- var headerDiv = Functions.createElement({
- type: "div"
- });
- self.setHeader(new Header({
- element: headerDiv,
- customMap: null,
- project: self.getProject(),
- adminLink: false
- }));
- self.getElement().appendChild(headerDiv);
var panels = [{
name: "PROJECTS",
@@ -150,7 +139,6 @@ Admin.prototype.init = function () {
for (var i = 0; i < this._panels.length; i++) {
promises.push(this._panels[i].init());
}
- promises.push(this.getHeader().init());
return Promise.all(promises).then(function () {
$(window).trigger('resize');
});
@@ -164,14 +152,6 @@ Admin.prototype.getConfiguration = function () {
return this._configuration;
};
-Admin.prototype.setHeader = function (header) {
- this._header = header;
-};
-
-Admin.prototype.getHeader = function () {
- return this._header;
-};
-
Admin.prototype.setGuiUtils = function (guiUtils) {
this._guiUtils = guiUtils;
};
@@ -183,7 +163,6 @@ Admin.prototype.getGuiUtils = function () {
Admin.prototype.destroy = function () {
var self = this;
var promises = [];
- promises.push(self.getHeader().destroy());
for (var i = 0; i < self._panels.length; i++) {
promises.push(self._panels[i].destroy());
}
diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
index c49f8a43876aef810ff89210c96b5ea4529812aa..bfee459c46c0c20ba815ff4636b3c081b58ef4fd 100644
--- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
@@ -154,7 +154,6 @@ UsersAdminPanel.prototype.getDialog = function (user) {
type: "div"
}),
user: user,
- project: self.getProject(),
customMap: null
});
self._dialogs[user.getLogin()] = dialog;
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index db32a2799498d6dc4cda37585b8d64400609b9aa..af8bcd6fdbe6bb97a6bb4d3b67fbb1457fe93237 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -563,9 +563,6 @@ function createAdmin(params) {
return ServerConnector.getConfiguration();
}).then(function (configuration) {
params.setConfiguration(configuration);
- return getProject(params);
- }).then(function (project) {
- params.setProject(project);
result = new Admin(params);
return result.init();
}).then(function () {
diff --git a/frontend-js/src/test/js/Admin-test.js b/frontend-js/src/test/js/Admin-test.js
index 55e12a8e74774eba4ae0a648d31f5a8a67839fcd..f9d2aede993e5baff62b8d30346775df2f022d14 100644
--- a/frontend-js/src/test/js/Admin-test.js
+++ b/frontend-js/src/test/js/Admin-test.js
@@ -11,7 +11,7 @@ var assert = require('assert');
describe('Admin', function () {
describe('constructor', function () {
it('default', function () {
- var admin = new Admin(helper.createCustomMapOptions());
+ var admin = new Admin(helper.createCustomMapOptions(null));
assert.ok(admin);
admin.destroy();
});
@@ -19,7 +19,7 @@ describe('Admin', function () {
describe('logout', function () {
it('default', function () {
- var admin = new Admin(helper.createCustomMapOptions());
+ var admin = new Admin(helper.createCustomMapOptions(null));
helper.loginAsAdmin();
var token = ServerConnector.getSessionData().getToken();
return admin.init().then(function () {
diff --git a/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js
index 38d68865a65cbbf5287b941de580fe5241041e95..aec9f1424ba9c0d4c26e31f63481753c1877d3d4 100644
--- a/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js
+++ b/frontend-js/src/test/js/gui/admin/ConfigurationAdminPanel-test.js
@@ -13,14 +13,9 @@ describe('ConfigurationAdminPanel', function () {
it('init', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new ConfigurationAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
@@ -31,14 +26,9 @@ describe('ConfigurationAdminPanel', function () {
});
it('saveOption', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new ConfigurationAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
diff --git a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
index d365b2e30cf63ae83cd5d96daa712e68dc4b9854..432507855c1f91d65ce881d0330825593522bed0 100644
--- a/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
+++ b/frontend-js/src/test/js/gui/admin/MapsAdminPanel-test.js
@@ -12,14 +12,9 @@ describe('MapsAdminPanel', function () {
it('refresh', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new MapsAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
@@ -32,19 +27,14 @@ describe('MapsAdminPanel', function () {
});
it('showLogs', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new MapsAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
}).then(function () {
- return mapTab.showLogs(project.getProjectId(), 'error');
+ return mapTab.showLogs("sample", 'error');
}).then(function () {
assert.equal(0, logger.getWarnings().length);
return mapTab.destroy();
@@ -54,18 +44,15 @@ describe('MapsAdminPanel', function () {
it('getDialog', function () {
helper.loginAsAdmin();
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new MapsAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
}).then(function () {
+ return ServerConnector.getProject();
+ }).then(function (project) {
return mapTab.getDialog(project);
}).then(function (dialog) {
assert.ok(dialog.getListeners("onSave").length > 0);
@@ -77,14 +64,9 @@ describe('MapsAdminPanel', function () {
describe('onAddClicked', function () {
it('default', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new MapsAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
@@ -96,14 +78,9 @@ describe('MapsAdminPanel', function () {
});
it('close and reopen', function () {
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new MapsAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
diff --git a/frontend-js/src/test/js/gui/admin/UserAdminPanel-test.js b/frontend-js/src/test/js/gui/admin/UserAdminPanel-test.js
index 5ff671dcf9132b4ca01ddd7544a70df7c5d8f64b..494f438fb552101f4ff552f6f98f493676bc5dbe 100644
--- a/frontend-js/src/test/js/gui/admin/UserAdminPanel-test.js
+++ b/frontend-js/src/test/js/gui/admin/UserAdminPanel-test.js
@@ -17,14 +17,9 @@ describe('UsersAdminPanel', function () {
it('default', function () {
helper.loginAsAdmin();
var usersTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
usersTab = new UsersAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return usersTab.init();
@@ -35,18 +30,13 @@ describe('UsersAdminPanel', function () {
});
it('user without access', function () {
var usersTab;
- var project;
var oldFun = ServerConnector.getUsers;
ServerConnector.getUsers = function () {
return Promise.reject(new SecurityError("Access denied."));
};
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
usersTab = new UsersAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return usersTab.init();
@@ -63,14 +53,9 @@ describe('UsersAdminPanel', function () {
it('refresh', function () {
helper.loginAsAdmin();
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new UsersAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
@@ -84,14 +69,9 @@ describe('UsersAdminPanel', function () {
it('showEditDialog', function () {
helper.loginAsAdmin();
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new UsersAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
@@ -104,14 +84,9 @@ describe('UsersAdminPanel', function () {
it('onAddClicked', function () {
helper.loginAsAdmin();
var mapTab;
- var project;
- return ServerConnector.getProject().then(function (result) {
- project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
+ return ServerConnector.getConfiguration().then(function (configuration) {
mapTab = new UsersAdminPanel({
element: testDiv,
- project: project,
configuration: configuration
});
return mapTab.init();
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index a7af746ba7f478da89ed24c0f8c5875861346b52..038a8b0a54fd7bd49e74dd0763c18a722d3ac2d2 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -270,13 +270,10 @@ describe('minerva global', function () {
describe('createAdmin', function () {
it('as admin', function () {
helper.loginAsAdmin();
- var options = null;
+ var options = helper.createCustomMapOptions(null);
var url = window.location.href;
- return ServerConnectorMock.getProject().then(function (project) {
- options = helper.createCustomMapOptions(project);
- return minerva.createAdmin(options);
- }).then(function (result) {
+ return minerva.createAdmin(options).then(function (result) {
assert.ok(result);
assert.equal(logger.getWarnings().length, 0);
assert.equal(url, window.location.href);
diff --git a/web/src/main/webapp/admin.xhtml b/web/src/main/webapp/admin.xhtml
index cb45340c660f3040f0d47f6f9cc75f7235142210..ead931a8ed6f2a526e1320c17677c1ffd7828026 100644
--- a/web/src/main/webapp/admin.xhtml
+++ b/web/src/main/webapp/admin.xhtml
@@ -40,7 +40,6 @@ function initMap(){
}).then(function(result){
if (result!==undefined) {
customMap = result;
- document.title = result.getProject().getName();
}
}).catch(function(rejectReason){
minerva.GuiConnector.alert(rejectReason);