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

Allow GroupViews to be controlled by flags. Implement MULTISELECT and SHOW_CONNECTIONS flags.

Browse Source
This commit is contained in:
Michael Jumper
2013-08-14 15:23:29 -07:00
parent c600e289c3
commit bb0d41ae01
3 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,7 +497,8 @@ GuacAdmin.UserEditor = function(name, parameters) {
var connections_section = GuacUI.createChildElement(sections, "dd");
// Construct group view for all readable connections
var group_view = new GuacUI.GroupView(GuacAdmin.cached_root_group, true);
var group_view = new GuacUI.GroupView(GuacAdmin.cached_root_group,
GuacUI.GroupView.SHOW_CONNECTIONS | GuacUI.GroupView.MULTISELECT);
connections_section.appendChild(group_view.getElement());
// Update connection permissions when changed
@@ -1231,7 +1232,7 @@ GuacAdmin.reset = function() {
// Add new group view
GuacAdmin.containers.connection_list.innerHTML = "";
var group_view = new GuacUI.GroupView(GuacAdmin.cached_root_group, false);
var group_view = new GuacUI.GroupView(GuacAdmin.cached_root_group, GuacUI.GroupView.SHOW_CONNECTIONS);
GuacAdmin.containers.connection_list.appendChild(group_view.getElement());
// Show connection editor when connections are clicked

27
guacamole/src/main/webapp/scripts/guac-ui.js
View File

@@ -912,9 +912,10 @@ GuacUI.ListGroup = function(caption) {
* @constructor
* @param {GuacamoleService.ConnectionGroup} root_group The group to display
* within the view.
* @param {Boolean} multiselect Whether multiple objects are selectable.
* @param {Number} flags Any flags (such as MULTISELECT or SHOW_CONNECTIONS)
* for modifying the behavior of this group view.
*/
GuacUI.GroupView = function(root_group, multiselect) {
GuacUI.GroupView = function(root_group, flags) {
/**
* Reference to this GroupView.
@@ -926,6 +927,16 @@ GuacUI.GroupView = function(root_group, multiselect) {
var element = GuacUI.createElement("div", "group-view");
var list = GuacUI.createChildElement(element, "div", "list");
/**
* Whether multiselect is enabled.
*/
var multiselect = flags & GuacUI.GroupView.MULTISELECT;
/**
* Whether connections should be included in the view.
*/
var show_connections = flags & GuacUI.GroupView.SHOW_CONNECTIONS;
/**
* Set of all group checkboxes, indexed by ID. Only applicable when
* multiselect is enabled.
@@ -1102,6 +1113,7 @@ GuacUI.GroupView = function(root_group, multiselect) {
group_view.groups[group.id] = group;
// Add all contained connections
if (show_connections) {
for (i=0; i<group.connections.length; i++) {
// Add connection to set
@@ -1155,6 +1167,7 @@ GuacUI.GroupView = function(root_group, multiselect) {
})(connection);
} // end for each connection
}
// Add all contained groups
for (i=0; i<group.groups.length; i++) {
@@ -1229,6 +1242,16 @@ GuacUI.GroupView = function(root_group, multiselect) {
};
/**
* When set, allows multiple groups (or connections to be selected).
*/
GuacUI.GroupView.MULTISELECT = 0x1;
/**
* When set, also displays connections within the visible groups.
*/
GuacUI.GroupView.SHOW_CONNECTIONS = 0x2;
/**
* Simple modal dialog providing a header, body, and footer. No other
* functionality is provided other than a reasonable hierarchy of divs and

2
guacamole/src/main/webapp/scripts/root-ui.js
View File

@@ -176,7 +176,7 @@ GuacamoleRootUI.reset = function() {
// Create group view
var group_view = new GuacUI.GroupView(root_group);
var group_view = new GuacUI.GroupView(root_group, GuacUI.GroupView.SHOW_CONNECTIONS);
GuacamoleRootUI.sections.all_connections.appendChild(group_view.getElement());
// Add any connections with thumbnails