diff --git a/src/sunstone/public/app/tabs/secgroups-tab/actions.js b/src/sunstone/public/app/tabs/secgroups-tab/actions.js index 026e905052..c5f1bcaaf0 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/actions.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/actions.js @@ -3,8 +3,10 @@ define(function(require) { var Notifier = require('utils/notifier'); var Locale = require('utils/locale'); var DataTable = require('./datatable'); - var OpenNebulaSecurityGroup = require('opennebula/securitygroup'); + var OpenNebulaResource = require('opennebula/securitygroup'); + var RESOURCE = "SecurityGroup"; + var XML_ROOT = "SECURITY_GROUP"; var TAB_ID = require('./tabId'); var CREATE_DIALOG_ID = require('./form-panels/create/formPanelId'); @@ -12,7 +14,7 @@ define(function(require) { "SecurityGroup.create" : { type: "create", - call: OpenNebulaSecurityGroup.create, + call: OpenNebulaResource.create, callback: function(request, response) { Sunstone.resetFormPanel(TAB_ID, CREATE_DIALOG_ID); Sunstone.hideFormPanel(TAB_ID); @@ -34,7 +36,7 @@ define(function(require) { "SecurityGroup.list" : { type: "list", - call: OpenNebulaSecurityGroup.list, + call: OpenNebulaResource.list, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateView(request, response); }, @@ -43,7 +45,7 @@ define(function(require) { "SecurityGroup.show" : { type: "single", - call: OpenNebulaSecurityGroup.show, + call: OpenNebulaResource.show, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateElement(request, response); if (Sunstone.rightInfoVisible($('#'+TAB_ID))) { @@ -58,10 +60,10 @@ define(function(require) { call: function() { var tab = $('#' + TAB_ID); if (Sunstone.rightInfoVisible(tab)) { - Sunstone.runAction("SecurityGroup.show", Sunstone.rightInfoResourceId(tab)); + Sunstone.runAction(RESOURCE+".show", Sunstone.rightInfoResourceId(tab)); } else { Sunstone.getDataTable(TAB_ID).waitingNodes(); - Sunstone.runAction("SecurityGroup.list", {force: true}); + Sunstone.runAction(RESOURCE+".list", {force: true}); } }, error: Notifier.onError @@ -69,7 +71,7 @@ define(function(require) { "SecurityGroup.delete" : { type: "multiple", - call : OpenNebulaSecurityGroup.del, + call : OpenNebulaResource.del, callback : function(request, response) { Sunstone.getDataTable(TAB_ID).deleteElement(request, response); }, @@ -79,58 +81,49 @@ define(function(require) { error: Notifier.onError, notify: true }, - /* - TODO - "SecurityGroup.update_dialog" : { - type: "custom", - call: function(){ - var selected_nodes = securityGroupElements(); - if ( selected_nodes.length != 1 ) { - notifyMessage("Please select one (and just one) Security Group to update."); - return false; - } - var resource_id = ""+selected_nodes[0]; - Sunstone.runAction("SecurityGroup.show_to_update", resource_id); + "SecurityGroup.update_dialog" : { + type: "custom", + call: function() { + var selected_nodes = Sunstone.getDataTable(TAB_ID).elements(); + if (selected_nodes.length != 1) { + Notifier.notifyMessage("Please select one (and just one) Security Group to update."); + return false; } + + var resource_id = "" + selected_nodes[0]; + Sunstone.runAction(RESOURCE+".show_to_update", resource_id); + } }, "SecurityGroup.show_to_update" : { - type: "single", - call: OpenNebulaSecurityGroup.show, - callback: function(request, response) { - // TODO: global var, better use jquery .data - sg_to_update_id = response.SECURITY_GROUP.ID; - - Sunstone.popUpFormPanel("create_security_group_form", "secgroups-tab", "create", true); - - Sunstone.popUpFormPanel("create_security_group_form", "secgroups-tab", "update", true, function(context){ - fillSecurityGroupUpdateFormPanel(response.SECURITY_GROUP, context); - }); - }, - error: Notifier.onError + type: "single", + call: OpenNebulaResource.show, + callback: function(request, response) { + Sunstone.showFormPanel(TAB_ID, CREATE_DIALOG_ID, "update", + function(formPanelInstance, context) { + formPanelInstance.fill(context, response[XML_ROOT]); + }); + }, + error: Notifier.onError }, - + "SecurityGroup.update" : { - type: "single", - call: OpenNebulaSecurityGroup.update, - callback: function(request, response){ - $("a[href=back]", $("#secgroups-tab")).trigger("click"); - popFormDialog("create_security_group_form", $("#secgroups-tab")); - - notifyMessage(tr("Security Group updated correctly")); - }, - error: function(request, response){ - popFormDialog("create_security_group_form", $("#secgroups-tab")); - - onError(request, response); - } + type: "single", + call: OpenNebulaResource.update, + callback: function(request, response){ + Sunstone.hideFormPanel(TAB_ID); + Notifier.notifyMessage(Locale.tr("Security Group updated correctly")); + }, + error: function(request, response) { + Sunstone.hideFormPanelLoading(TAB_ID); + Notifier.onError(request, response); + } }, - */ "SecurityGroup.update_template" : { type: "single", - call: OpenNebulaSecurityGroup.update, + call: OpenNebulaResource.update, callback: function(request,response){ Sunstone.runAction('SecurityGroup.show',request.request.data[0][0]); }, @@ -139,9 +132,9 @@ define(function(require) { "SecurityGroup.chown" : { type: "multiple", - call: OpenNebulaSecurityGroup.chown, + call: OpenNebulaResource.chown, callback: function (req) { - Sunstone.runAction("SecurityGroup.show", req.request.data[0]); + Sunstone.runAction(RESOURCE+".show", req.request.data[0]); }, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); @@ -152,9 +145,9 @@ define(function(require) { "SecurityGroup.chgrp" : { type: "multiple", - call: OpenNebulaSecurityGroup.chgrp, + call: OpenNebulaResource.chgrp, callback: function (req) { - Sunstone.runAction("SecurityGroup.show", req.request.data[0]); + Sunstone.runAction(RESOURCE+".show", req.request.data[0]); }, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); @@ -165,9 +158,9 @@ define(function(require) { "SecurityGroup.chmod" : { type: "single", - call: OpenNebulaSecurityGroup.chmod, + call: OpenNebulaResource.chmod, callback: function (req) { - Sunstone.runAction("SecurityGroup.show", req.request.data[0]); + Sunstone.runAction(RESOURCE+".show", req.request.data[0]); }, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); @@ -186,14 +179,14 @@ define(function(require) { "SecurityGroup.clone" : { type: "single", - call: OpenNebulaSecurityGroup.clone, + call: OpenNebulaResource.clone, error: Notifier.onError, notify: true }, "SecurityGroup.rename" : { type: "single", - call: OpenNebulaSecurityGroup.rename, + call: OpenNebulaResource.rename, callback: function(request) { Sunstone.runAction('SecurityGroup.show',request.request.data[0][0]); }, diff --git a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js index b8da243b8b..8dd966628c 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js @@ -289,8 +289,45 @@ define(function(require) { } function _fill(context, element) { + var that = this; + this.resourceId = element.ID; - // TODO + // Populates the Avanced mode Tab + $('#template', context).val(TemplateUtils.templateToString(element.TEMPLATE).replace(/^[\r\n]+$/g, "")); + + $('#security_group_name',context).val( + TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.NAME ))). + prop("disabled", true); + + $('#security_group_description', context).val( + TemplateUtils.escapeDoubleQuotes(TemplateUtils.htmlDecode( element.TEMPLATE.DESCRIPTION )) ); + + var rules = element.TEMPLATE.RULE; + + if (!rules) { //empty + rules = []; + } + else if (rules.constructor != Array) { //>1 rule + rules = [rules]; + } + + $.each(rules, function(){ + var text = Utils.sgRuleToSt(this); + + $(".security_group_rules tbody", context).append( + '