From 4a6036baa2e2d171c7c2e437a36b778c4d0f40ff Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 4 Mar 2013 01:37:41 -0800 Subject: [PATCH] Add missing admin permission check to connection/user management sections. --- guacamole/src/main/webapp/scripts/admin-ui.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/webapp/scripts/admin-ui.js b/guacamole/src/main/webapp/scripts/admin-ui.js index d6f19b1cf..d82da7de6 100644 --- a/guacamole/src/main/webapp/scripts/admin-ui.js +++ b/guacamole/src/main/webapp/scripts/admin-ui.js @@ -951,7 +951,8 @@ GuacAdmin.reset = function() { GuacAdmin.cached_connections.sort(GuacamoleService.Connections.comparator); // Connection management - if (GuacAdmin.cached_permissions.create_connection + if (GuacAdmin.cached_permissions.administer + || GuacAdmin.cached_permissions.create_connection || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.update_connection) || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.remove_connection) || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.administer_connection)) @@ -960,7 +961,8 @@ GuacAdmin.reset = function() { GuacUI.removeClass(document.body, "manage-connections"); // User management - if (GuacAdmin.cached_permissions.create_user + if (GuacAdmin.cached_permissions.administer + || GuacAdmin.cached_permissions.create_user || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.update_user) || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.remove_user) || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.administer_user)) @@ -969,7 +971,8 @@ GuacAdmin.reset = function() { GuacUI.removeClass(document.body, "manage-users"); // Connection creation - if (GuacAdmin.cached_permissions.create_connection) { + if (GuacAdmin.cached_permissions.administer + || GuacAdmin.cached_permissions.create_connection) { GuacUI.addClass(document.body, "add-connections"); GuacAdmin.buttons.add_connection.onclick = function() { @@ -993,7 +996,8 @@ GuacAdmin.reset = function() { } // User creation - if (GuacAdmin.cached_permissions.create_user) { + if (GuacAdmin.cached_permissions.administer + || GuacAdmin.cached_permissions.create_user) { GuacUI.addClass(document.body, "add-users"); GuacAdmin.buttons.add_user.onclick = function() {