safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #268: Sort connections and users in main UI.

Browse Source
This commit is contained in:
Michael Jumper
2013-02-18 12:03:05 -08:00
parent 9d07362469
commit dec21e5674
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -962,6 +962,11 @@ GuacAdmin.reset = function() {
GuacAdmin.cached_protocols = GuacamoleService.Protocols.list(); GuacAdmin.cached_protocols = GuacamoleService.Protocols.list();
GuacAdmin.cached_connections = GuacamoleService.Connections.list(); GuacAdmin.cached_connections = GuacamoleService.Connections.list();
// Sort connections by ID
GuacAdmin.cached_connections.sort(function(a, b) {
return a.id.localeCompare(b.id);
});
// Connection management // Connection management
if (GuacAdmin.cached_permissions.create_connection if (GuacAdmin.cached_permissions.create_connection
|| GuacAdmin.hasEntry(GuacAdmin.cached_permissions.update_connection) || GuacAdmin.hasEntry(GuacAdmin.cached_permissions.update_connection)
@@ -1026,6 +1031,8 @@ GuacAdmin.reset = function() {
} }
var i;
/* /*
* Add readable users. * Add readable users.
*/ */
@@ -1040,8 +1047,9 @@ GuacAdmin.reset = function() {
GuacAdmin.userPager = new GuacAdmin.Pager(GuacAdmin.containers.user_list); GuacAdmin.userPager = new GuacAdmin.Pager(GuacAdmin.containers.user_list);
// Add users to pager // Add users to pager
for (var name in GuacAdmin.cached_permissions.read_user) var usernames = Object.keys(GuacAdmin.cached_permissions.read_user).sort();
GuacAdmin.addUser(name) for (i=0; i<usernames.length; i++)
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 = "";
@@ -1066,7 +1074,7 @@ GuacAdmin.reset = function() {
GuacAdmin.connectionPager = new GuacAdmin.Pager(GuacAdmin.containers.connection_list); GuacAdmin.connectionPager = new GuacAdmin.Pager(GuacAdmin.containers.connection_list);
// Add connections to pager // Add connections to pager
for (var i=0; i<GuacAdmin.cached_connections.length; i++) for (i=0; i<GuacAdmin.cached_connections.length; i++)
GuacAdmin.addConnection(GuacAdmin.cached_connections[i]); GuacAdmin.addConnection(GuacAdmin.cached_connections[i]);
// If more than one page, add navigation buttons // If more than one page, add navigation buttons