From b8351d2e41d2ef4d893fdab1e14a4b5af60f5ba2 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Dec 2015 17:56:16 +0100 Subject: [PATCH] feature #4184: Add Network.append action --- src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb | 6 +++++- src/sunstone/public/app/opennebula/network.js | 4 ++++ src/sunstone/public/app/tabs/vnets-tab/actions.js | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index adc65fb5c8..3626c29255 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -62,7 +62,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/network.js b/src/sunstone/public/app/opennebula/network.js index 130bff63e0..4922c8b51b 100644 --- a/src/sunstone/public/app/opennebula/network.js +++ b/src/sunstone/public/app/opennebula/network.js @@ -80,6 +80,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); + }, "rename" : function(params) { var action_obj = params.data.extra_param; OpenNebulaAction.simple_action(params, RESOURCE, "rename", action_obj); diff --git a/src/sunstone/public/app/tabs/vnets-tab/actions.js b/src/sunstone/public/app/tabs/vnets-tab/actions.js index 034dc659e5..d799944d6a 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/actions.js +++ b/src/sunstone/public/app/tabs/vnets-tab/actions.js @@ -50,6 +50,7 @@ define(function(require) { "Network.rename": _commonActions.singleAction('rename'), "Network.update" : _commonActions.update(), "Network.update_template" : _commonActions.updateTemplate(), + "Network.append_template" : _commonActions.appendTemplate(), "Network.update_dialog" : _commonActions.checkAndShowUpdate(), "Network.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),