Commit 353d0599 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '681-map-management' into 'devel_12.1.x'

Resolve "Map management privilege does not enable Edit/Remove buttons"

See merge request !635
parents ef6aebae a2fc8635
Pipeline #8666 passed with stage
in 1 minute and 53 seconds
minerva (12.1.8) stable; urgency=medium minerva (12.1.8) stable; urgency=medium
* Bug fix: add a project reset users custom overlays limit to default (#679) * Bug fix: add a project reset users custom overlays limit to default (#679)
* Bug fix: edit/remove project button was disabled based on Configuration
Manage Privilege, but should be based on Project Manage Privilege (#681)
-- Piotr Gawron <piotr.gawron@uni.lu> Fri, 8 Feb 2019 15:30:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Fri, 8 Feb 2019 15:30:00 +0200
......
...@@ -237,7 +237,7 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) { ...@@ -237,7 +237,7 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) {
row[4] = status; row[4] = status;
var disabled = " disabled "; var disabled = " disabled ";
if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.CONFIGURATION_MANAGE))) { if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.ADD_MAP))) {
disabled = ""; disabled = "";
} }
row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'" + disabled + "><i class='fa fa-edit' style='font-size:17px'></i></button>"; row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'" + disabled + "><i class='fa fa-edit' style='font-size:17px'></i></button>";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment