From 280b28aa3b3156d00b50d6fbd91bc2707e5f594c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 22 Mar 2018 11:33:21 +0100
Subject: [PATCH] when user doesn't have user management privileges then he
shouldn't refresh privileges in project tab
---
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index a4a16ac1e5..81b5d6bae5 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -6,6 +6,7 @@ var AbstractAdminPanel = require('./AbstractAdminPanel');
var AddProjectDialog = require('./AddProjectDialog');
var EditProjectDialog = require('./EditProjectDialog');
var LogListDialog = require('./LogListDialog');
+var PrivilegeType = require('../../map/data/PrivilegeType');
// noinspection JSUnusedLocalSymbols
var logger = require('../../logger');
@@ -286,8 +287,15 @@ MapsAdminPanel.prototype.onRefreshClicked = function () {
return ServerConnector.getProjects(true).then(function (projects) {
return self.setProjects(projects);
}).then(function () {
+ return ServerConnector.getLoggedUser();
+ }).then(function (user) {
+ var privilege = self.getConfiguration().getPrivilegeType(PrivilegeType.USER_MANAGEMENT);
//we need to refresh users as well because of privileges
- return ServerConnector.getUsers(true);
+ if (user.hasPrivilege(privilege)) {
+ return ServerConnector.getUsers(true);
+ } else {
+ return Promise.resolve();
+ }
});
};
--
GitLab