Ticket #268: Partial cleanup. Remove old connection form, stub new.

This commit is contained in:
Michael Jumper
2013-02-13 16:03:12 -08:00
parent 2a71da3827
commit abbbf00886

View File

@@ -38,7 +38,14 @@ var GuacAdmin = {
"connection_id" : document.getElementById("connection-id"), "connection_id" : document.getElementById("connection-id"),
"protocol" : document.getElementById("protocol"), "protocol" : document.getElementById("protocol"),
"username" : document.getElementById("username") "username" : document.getElementById("username")
} },
"cached_permissions" : null,
"cached_protocols" : null,
"cached_connections" : null,
"selected_user" : null,
"selected_connection" : null
}; };
@@ -378,92 +385,10 @@ GuacAdmin.hasEntry = function(object) {
return false; return false;
}; };
GuacAdmin.reset = function() { /**
* Adds the user with the given name to the displayed user list.
/*
* Show admin elements if admin permissions available
*/ */
GuacAdmin.addUser = function(name) {
// Get permissions
var permissions = GuacamoleService.Permissions.list();
// Get protocols
var protocols = GuacamoleService.Protocols.list();
// Connection management
if (permissions.create_connection
|| GuacAdmin.hasEntry(permissions.update_connection)
|| GuacAdmin.hasEntry(permissions.remove_connection)
|| GuacAdmin.hasEntry(permissions.administer_connection))
GuacUI.addClass(document.body, "manage-connections");
else
GuacUI.removeClass(document.body, "manage-connections");
// User management
if (permissions.create_user
|| GuacAdmin.hasEntry(permissions.update_user)
|| GuacAdmin.hasEntry(permissions.remove_user)
|| GuacAdmin.hasEntry(permissions.administer_user))
GuacUI.addClass(document.body, "manage-users");
else
GuacUI.removeClass(document.body, "manage-users");
// Connection creation
if (permissions.create_connection) {
GuacUI.addClass(document.body, "add-connections");
GuacAdmin.buttons.add_connection.onclick = function() {
// Try to create connection
try {
var connection = new GuacamoleService.Connection(
GuacAdmin.fields.protocol.value, GuacAdmin.fields.connection_id.value);
GuacamoleService.Connections.create(connection);
GuacAdmin.fields.connection_id.value = "";
GuacAdmin.reset();
}
// Alert on failure
catch (e) {
alert(e.message);
}
};
}
// User creation
if (permissions.create_user) {
GuacUI.addClass(document.body, "add-users");
GuacAdmin.buttons.add_user.onclick = function() {
// Attempt to create user
try {
GuacamoleService.Users.create(GuacAdmin.fields.username.value);
GuacAdmin.fields.username.value = "";
GuacAdmin.reset();
}
// Alert on failure
catch (e) {
alert(e.message);
}
};
}
/*
* Add readable users.
*/
var name;
var selected_user = null;
// Add users to list
GuacAdmin.lists.user_list.innerHTML = "";
for (name in permissions.read_user) {(function(name){
// Create user list item // Create user list item
var item = new GuacAdmin.ListItem("user", name); var item = new GuacAdmin.ListItem("user", name);
@@ -474,8 +399,8 @@ GuacAdmin.reset = function() {
item_element.onclick = function() { item_element.onclick = function() {
// Ignore clicks if any item is selected // Ignore clicks if any item is selected
if (selected_user) return; if (GuacAdmin.selected_user) return;
else selected_user = name; else GuacAdmin.selected_user = name;
// Get user permissions // Get user permissions
var user_perms = GuacamoleService.Permissions.list(name); var user_perms = GuacamoleService.Permissions.list(name);
@@ -500,7 +425,7 @@ GuacAdmin.reset = function() {
GuacUI.removeClass(GuacAdmin.lists.user_list, "disabled"); GuacUI.removeClass(GuacAdmin.lists.user_list, "disabled");
GuacUI.removeClass(item_element, "selected"); GuacUI.removeClass(item_element, "selected");
item_element.removeChild(form_element); item_element.removeChild(form_element);
selected_user = null; GuacAdmin.selected_user = null;
} }
// Select // Select
@@ -533,7 +458,7 @@ GuacAdmin.reset = function() {
// If readable connections exist, list them // If readable connections exist, list them
var selected_connections = {}; var selected_connections = {};
if (GuacAdmin.hasEntry(permissions.administer_connection)) { if (GuacAdmin.hasEntry(GuacAdmin.cached_permissions.administer_connection)) {
// Add fields for per-connection checkboxes // Add fields for per-connection checkboxes
var connections_header = GuacUI.createChildElement(sections, "dt"); var connections_header = GuacUI.createChildElement(sections, "dt");
@@ -542,7 +467,7 @@ GuacAdmin.reset = function() {
GuacUI.createChildElement(sections, "dd"), GuacUI.createChildElement(sections, "dd"),
"div", "list"); "div", "list");
for (var conn in permissions.administer_connection) { for (var conn in GuacAdmin.cached_permissions.administer_connection) {
var connection = GuacUI.createChildElement(connections, "div", "connection"); var connection = GuacUI.createChildElement(connections, "div", "connection");
var connection_field = GuacUI.createChildElement(connection, "input"); var connection_field = GuacUI.createChildElement(connection, "input");
@@ -606,7 +531,7 @@ GuacAdmin.reset = function() {
// Save user // Save user
GuacamoleService.Users.update( GuacamoleService.Users.update(
selected_user, password, user_perms); GuacAdmin.selected_user, password, user_perms);
deselect(); deselect();
GuacAdmin.reset(); GuacAdmin.reset();
@@ -626,7 +551,7 @@ GuacAdmin.reset = function() {
}; };
// Add delete button if permission available // Add delete button if permission available
if (name in permissions.remove_user) { if (name in GuacAdmin.cached_permissions.remove_user) {
// Create button // Create button
var delete_button = GuacUI.createChildElement(button_div, "button"); var delete_button = GuacUI.createChildElement(button_div, "button");
@@ -637,7 +562,7 @@ GuacAdmin.reset = function() {
e.stopPropagation(); e.stopPropagation();
GuacamoleService.Users.remove(selected_user); GuacamoleService.Users.remove(GuacAdmin.selected_user);
deselect(); deselect();
GuacAdmin.reset(); GuacAdmin.reset();
@@ -650,18 +575,12 @@ GuacAdmin.reset = function() {
}; };
})(name)}; };
/* /**
* Add readable connections. * Adds the given connection to the displayed connection list.
*/ */
GuacAdmin.addConnection = function(connection) {
var selected_connection = null;
var connections = GuacamoleService.Connections.list();
// Add connections to list
GuacAdmin.lists.connection_list.innerHTML = "";
for (i=0; i<connections.length; i++) {(function(connection){
var item = new GuacAdmin.ListItem("connection", connection.id); var item = new GuacAdmin.ListItem("connection", connection.id);
var item_element = item.getElement(); var item_element = item.getElement();
@@ -670,83 +589,105 @@ GuacAdmin.reset = function() {
item_element.onclick = function() { item_element.onclick = function() {
// Ignore clicks if any item is selected // Ignore clicks if any item is selected
if (selected_connection) return; if (GuacAdmin.selected_connection) return;
else selected_connection = connection.id; else GuacAdmin.selected_connection = connection.id;
// Load buttons /* STUB */
var buttons = [new GuacAdmin.Button("Save"),
new GuacAdmin.Button("Cancel")];
var fields = []; };
if (connection.id in permissions.remove_connection) };
buttons.push(new GuacAdmin.Button("Delete"));
// FIXME: Actually generate form from properties GuacAdmin.reset = function() {
// Connection property form. /*
var connection_properties = new GuacAdmin.Form( * Show admin elements if admin permissions available
*/
/* Fields */ // Query service for permissions, protocols, and connections
[new GuacAdmin.Field.TEXT("Hostname:", [], GuacAdmin.cached_permissions = GuacamoleService.Permissions.list();
[connection.parameters.hostname || ""]), GuacAdmin.cached_protocols = GuacamoleService.Protocols.list();
GuacAdmin.cached_connections = GuacamoleService.Connections.list();
new GuacAdmin.Field.TEXT("Port:", [], // Connection management
[connection.parameters.port || ""])], if (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))
GuacUI.addClass(document.body, "manage-connections");
else
GuacUI.removeClass(document.body, "manage-connections");
/* Buttons */ // User management
buttons if (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))
GuacUI.addClass(document.body, "manage-users");
else
GuacUI.removeClass(document.body, "manage-users");
); // Connection creation
if (GuacAdmin.cached_permissions.create_connection) {
GuacUI.addClass(document.body, "add-connections");
// Select GuacAdmin.buttons.add_connection.onclick = function() {
GuacUI.addClass(GuacAdmin.lists.connection_list, "disabled");
GuacUI.addClass(item_element, "selected");
// Handle buttons
connection_properties.onaction = function(title, fields) {
// Try to create connection
try { try {
var connection = new GuacamoleService.Connection(
if (title == "Save") { GuacAdmin.fields.protocol.value, GuacAdmin.fields.connection_id.value);
GuacamoleService.Connections.create(connection);
// Get fields (FIXME: Actually implement) GuacAdmin.fields.connection_id.value = "";
var hostname = fields[0][0];
var port = fields[1][0];
// Update fields
connection.parameters.hostname = hostname;
connection.parameters.port = port;
// Save connection
GuacamoleService.Connections.update(connection);
GuacAdmin.reset();
}
else if (title == "Delete") {
GuacamoleService.Connections.remove(selected_connection);
GuacAdmin.reset(); GuacAdmin.reset();
} }
// Deselect // Alert on failure
GuacUI.removeClass(GuacAdmin.lists.connection_list, "disabled");
GuacUI.removeClass(item_element, "selected");
item_element.removeChild(connection_properties.getElement());
selected_connection = null;
}
catch (e) { catch (e) {
alert(e.message); alert(e.message);
} }
}; };
item_element.appendChild(connection_properties.getElement()); }
// User creation
if (GuacAdmin.cached_permissions.create_user) {
GuacUI.addClass(document.body, "add-users");
GuacAdmin.buttons.add_user.onclick = function() {
// Attempt to create user
try {
GuacamoleService.Users.create(GuacAdmin.fields.username.value);
GuacAdmin.fields.username.value = "";
GuacAdmin.reset();
}
// Alert on failure
catch (e) {
alert(e.message);
}
}; };
}
})(connections[i])}; /*
* Add readable users.
*/
GuacAdmin.lists.user_list.innerHTML = "";
for (var name in GuacAdmin.cached_permissions.read_user)
GuacAdmin.addUser(name)
/*
* Add readable connections.
*/
GuacAdmin.lists.connection_list.innerHTML = "";
for (var i=0; i<GuacAdmin.cached_connections.length; i++)
GuacAdmin.addConnection(GuacAdmin.cached_connections[i]);
}; };