diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index 4d5f2f0f13..1fb96a2c8a 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -96,7 +96,10 @@ module OpenNebulaJSON end def update_ar(params=Hash.new) - super(params['ar_template_raw']) + template_json = params['ar_template'] + template = template_to_str(template_json) + + super(template) end end end diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index d1b40be2f9..33bbf42ccc 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -796,7 +796,7 @@ var OpenNebula = { action_obj); }, "update_ar": function(params){ - var action_obj = {"ar_template_raw" : params.data.extra_param }; + var action_obj = {"ar_template" : params.data.extra_param }; OpenNebula.Action.simple_action(params, OpenNebula.Network.resource, "update_ar", diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index ed101a47d4..e9457da542 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -332,7 +332,12 @@ var vnet_actions = { type: "single", call: OpenNebula.Network.add_ar, callback: function(req) { - Sunstone.runAction("Network.show",req.request.data[0][0]); + // Reset the wizard + $add_ar_dialog.foundation('reveal', 'close'); + $add_ar_dialog.empty(); + setupAddARDialog(); + + Sunstone.runAction("Network.show",req.request.data[0][0]); }, error: onError }, @@ -350,7 +355,12 @@ var vnet_actions = { type: "single", call: OpenNebula.Network.update_ar, callback: function(req) { - Sunstone.runAction("Network.show",req.request.data[0][0]); + // Reset the wizard + $update_ar_dialog.foundation('reveal', 'close'); + $update_ar_dialog.empty(); + setupUpdateARDialog(); + + Sunstone.runAction("Network.show",req.request.data[0][0]); }, error: onError }, @@ -681,6 +691,9 @@ function updateVNetworkInfo(request,vn){ $(this).addClass('markrowchecked'); }); + $("#update_ar_button", $("#vnet_info_panel")).attr("ar_id", id).removeAttr('disabled'); + $("#rm_ar_button", $("#vnet_info_panel")).attr("ar_id", id).removeAttr('disabled'); + $("#ar_show_info", $("#vnet_info_panel")).html(ar_show_info(vn_info, id)); return false; @@ -715,17 +728,35 @@ function ar_list_tab_content(vn_info){ var html = '