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

Display all users/connections properly when admin, send error message header before sending error code.

Browse Source
This commit is contained in:
Michael Jumper
2013-03-03 23:42:34 -08:00
parent 7046bd76e3
commit 4a9e1484db
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java
View File

@@ -187,8 +187,8 @@ public abstract class AuthenticatingHttpServlet extends HttpServlet {
// If response not committed, send error code // If response not committed, send error code
if (!response.isCommitted()) { if (!response.isCommitted()) {
response.sendError(code);
response.addHeader("Guacamole-Error-Message", message); response.addHeader("Guacamole-Error-Message", message);
response.sendError(code);
} }
} }

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

@@ -491,11 +491,14 @@ GuacAdmin.addUser = function(name) {
var connections_pager = new GuacUI.Pager(connections); var connections_pager = new GuacUI.Pager(connections);
// Add connections to pager // Add connections to pager
var available_connections = var available_connections = GuacAdmin.cached_connections;
Object.keys(GuacAdmin.cached_permissions.administer_connection).sort();
for (var i=0; i<available_connections.length; i++) { for (var i=0; i<available_connections.length; i++) {
var conn = available_connections[i]; // If no admin permission, do not list connection
var conn = available_connections[i].id;
if (!GuacAdmin.cached_permissions.administer &&
!(conn in GuacAdmin.cached_permissions.administer_connection))
continue;
var connection = GuacUI.createElement("div", "connection"); var connection = GuacUI.createElement("div", "connection");
var connection_field = GuacUI.createChildElement(connection, "input"); var connection_field = GuacUI.createChildElement(connection, "input");
@@ -594,7 +597,8 @@ GuacAdmin.addUser = function(name) {
}; };
// Add delete button if permission available // Add delete button if permission available
if (name in GuacAdmin.cached_permissions.remove_user) { if (GuacAdmin.cached_permissions.administer ||
name in GuacAdmin.cached_permissions.remove_user) {
// Create button // Create button
var delete_button = GuacUI.createChildElement(button_div, "button", "danger"); var delete_button = GuacUI.createChildElement(button_div, "button", "danger");
@@ -890,7 +894,8 @@ GuacAdmin.addConnection = function(connection) {
}; };
// Add delete button if permission available // Add delete button if permission available
if (connection.id in GuacAdmin.cached_permissions.remove_connection) { if (GuacAdmin.cached_permissions.administer ||
connection.id in GuacAdmin.cached_permissions.remove_connection) {
// Create button // Create button
var delete_button = GuacUI.createChildElement(button_div, "button", "danger"); var delete_button = GuacUI.createChildElement(button_div, "button", "danger");
@@ -1024,9 +1029,12 @@ GuacAdmin.reset = function() {
GuacAdmin.userPager = new GuacUI.Pager(GuacAdmin.containers.user_list); GuacAdmin.userPager = new GuacUI.Pager(GuacAdmin.containers.user_list);
// Add users to pager // Add users to pager
var usernames = Object.keys(GuacAdmin.cached_permissions.read_user).sort(); var usernames = GuacamoleService.Users.list();
for (i=0; i<usernames.length; i++) for (i=0; i<usernames.length; i++) {
GuacAdmin.addUser(usernames[i]); if (GuacAdmin.cached_permissions.administer
|| usernames[i] in GuacAdmin.cached_permissions.update_user)
GuacAdmin.addUser(usernames[i]);
}
// If more than one page, add navigation buttons // If more than one page, add navigation buttons
GuacAdmin.containers.user_list_buttons.innerHTML = ""; GuacAdmin.containers.user_list_buttons.innerHTML = "";
@@ -1051,8 +1059,12 @@ GuacAdmin.reset = function() {
GuacAdmin.connectionPager = new GuacUI.Pager(GuacAdmin.containers.connection_list); GuacAdmin.connectionPager = new GuacUI.Pager(GuacAdmin.containers.connection_list);
// Add connections to pager // Add connections to pager
for (i=0; i<GuacAdmin.cached_connections.length; i++) for (i=0; i<GuacAdmin.cached_connections.length; i++) {
GuacAdmin.addConnection(GuacAdmin.cached_connections[i]); var connection = GuacAdmin.cached_connections[i];
if (GuacAdmin.cached_permissions.administer
|| connection.id in GuacAdmin.cached_permissions.update_connection)
GuacAdmin.addConnection(connection);
}
// If more than one page, add navigation buttons // If more than one page, add navigation buttons
GuacAdmin.containers.connection_list_buttons.innerHTML = ""; GuacAdmin.containers.connection_list_buttons.innerHTML = "";