From fb7c2c3252e94813ec6419df94ea247f8b0b10f7 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Thu, 24 Jan 2013 17:31:45 +0100 Subject: [PATCH] feature #1664: Rename almost done --- src/sunstone/public/js/opennebula.js | 1 + src/sunstone/public/js/plugins/vnets-tab.js | 4 +-- src/sunstone/public/js/sunstone-util.js | 27 ++------------------- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index df37237745..6e7510b87d 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -591,6 +591,7 @@ var OpenNebula = { OpenNebula.Action.show(params,OpenNebula.Network.resource,"template"); }, "rename" : function(params){ + var action_obj = params.data.extra_param; OpenNebula.Action.simple_action(params, OpenNebula.Network.resource, "rename", diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index e4f79995f4..0f5badc766 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -631,11 +631,11 @@ function updateVNetworkInfo(request,vn){ $(".input_edit_value_rename").live("change", function() { var value_str = $(".input_edit_value_rename").val(); - console.log(this); if(value_str!="") { // Let OpenNebula know - Sunstone.runAction("Network.rename",vn_info.ID,value_str); + var name_template = {"name": value_str}; + Sunstone.runAction("Network.rename",vn_info.ID,name_template); } }); diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index 236fb971d1..cf641bbfb5 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -1377,29 +1377,7 @@ function fromJSONtoHTMLTable(template_json,resource_type,resource_id){ // Helper for fromJSONtoHTMLTable function function fromJSONtoHTMLRow(field,value,template_json,resource_type,resource_id){ - var str=""; - - if (typeof value == 'object'){ - - for(var key in value){ - - str += '\ - '+tr(field)+'\ - '+value[key]+'\ -
\ - e\ -
\ - \ -
\ - x\ -
\ - \ - '; - - }; - - } else { - str += '\ + var str = '\ '+tr(field)+'\ '+value+'\
\ @@ -1410,8 +1388,7 @@ function fromJSONtoHTMLRow(field,value,template_json,resource_type,resource_id){ x\
\ \ - '; - }; + '; return str; }