From bb1229659efd3d63e5e11cb65131c5d51f348014 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Dec 2015 18:00:20 +0100 Subject: [PATCH] feature #4184: Add SecurityGroup.append action --- src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb | 6 +++++- src/sunstone/public/app/opennebula/securitygroup.js | 4 ++++ src/sunstone/public/app/tabs/secgroups-tab/actions.js | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb b/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb index 18b392ffae..cfea214b9e 100644 --- a/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb @@ -57,7 +57,11 @@ module OpenNebulaJSON end def update(params=Hash.new) - super(params['template_raw']) + if !params['append'].nil? + super(params['template_raw'], params['append']) + else + super(params['template_raw']) + end end def chown(params=Hash.new) diff --git a/src/sunstone/public/app/opennebula/securitygroup.js b/src/sunstone/public/app/opennebula/securitygroup.js index 6d40ac8639..2b75c5f6bb 100644 --- a/src/sunstone/public/app/opennebula/securitygroup.js +++ b/src/sunstone/public/app/opennebula/securitygroup.js @@ -48,6 +48,10 @@ define(function(require) { var action_obj = {"template_raw" : params.data.extra_param}; OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj); }, + "append": function(params) { + var action_obj = {"template_raw" : params.data.extra_param, append : true}; + OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj); + }, "clone" : function(params) { var name = params.data.extra_param ? params.data.extra_param : ""; var action_obj = {"name" : name}; diff --git a/src/sunstone/public/app/tabs/secgroups-tab/actions.js b/src/sunstone/public/app/tabs/secgroups-tab/actions.js index 814c23bfa0..7bc8b2cb30 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/actions.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/actions.js @@ -43,6 +43,7 @@ define(function(require) { "SecurityGroup.rename": _commonActions.singleAction('rename'), "SecurityGroup.update" : _commonActions.update(), "SecurityGroup.update_template" : _commonActions.updateTemplate(), + "SecurityGroup.append_template" : _commonActions.appendTemplate(), "SecurityGroup.update_dialog" : _commonActions.checkAndShowUpdate(), "SecurityGroup.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),