safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #268: User permission deltas. Do not explicitly list all permissions every update.

Browse Source
This commit is contained in:
Michael Jumper
2013-02-25 20:23:24 -08:00
parent 3dd855b6aa
commit 2164807314
3 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
guacamole/src/main/webapp/scripts/admin-ui.js
View File

@@ -352,6 +352,10 @@ GuacAdmin.addUser = function(name) {
// Get user permissions
var user_perms = GuacamoleService.Permissions.list(name);
// Permission deltas
var added_perms = new GuacamoleService.PermissionSet();
var removed_perms = new GuacamoleService.PermissionSet();
// Create form base elements
var form_element = GuacUI.createElement("div", "form");
var user_header = GuacUI.createChildElement(form_element, "h2");
@@ -404,7 +408,6 @@ GuacAdmin.addUser = function(name) {
};
// If readable connections exist, list them
var selected_connections = {};
if (GuacAdmin.hasEntry(GuacAdmin.cached_permissions.administer_connection)) {
// Add fields for per-connection checkboxes
@@ -439,17 +442,27 @@ GuacAdmin.addUser = function(name) {
connection_field.setAttribute("value", conn);
// Check checkbox if connection readable by selected user
if (conn in user_perms.read_connection) {
selected_connections[conn] = true;
if (conn in user_perms.read_connection)
connection_field.checked = true;
}
// Update selected connections when changed
connection_field.onclick = connection_field.onchange = function() {
if (this.checked)
selected_connections[this.value] = true;
else if (selected_connections[this.value])
delete selected_connections[this.value];
// Update permission deltas for ADDED permission
if (this.checked) {
added_perms.read_connection[this.value] = true;
if (removed_perms.read_connection[this.value])
delete removed_perms.read_connection[this.value];
}
// Update permission deltas for REMOVED permission
else {
removed_perms.read_connection[this.value] = true;
if (added_perms.read_connection[this.value])
delete added_perms.read_connection[this.value];
}
};
connection_name.textContent = conn;
@@ -496,12 +509,9 @@ GuacAdmin.addUser = function(name) {
else
password = null;
// Set user permissions
user_perms.read_connection = selected_connections;
// Save user
GuacamoleService.Users.update(
GuacAdmin.selected_user, password, user_perms);
GuacAdmin.selected_user, password, added_perms, removed_perms);
deselect();
GuacAdmin.reset();