From a99023b6b90eca5172ee565fcef7cf421e47bce6 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 25 Jan 2013 14:41:19 +0100 Subject: [PATCH] feature #1664: Add rename to vnets --- .../models/OpenNebulaJSON/ImageJSON.rb | 5 + src/sunstone/public/js/opennebula.js | 7 + src/sunstone/public/js/plugins/images-tab.js | 188 +++++------------- 3 files changed, 60 insertions(+), 140 deletions(-) diff --git a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb index 3d5dc124cc..6b60ca9005 100644 --- a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb @@ -59,6 +59,7 @@ module OpenNebulaJSON when "chmod" then self.chmod_octet(action_hash['params']) when "chtype" then self.chtype(action_hash['params']) when "clone" then self.clone(action_hash['params']) + when "rename" then self.rename(action_hash['params']) else error_msg = "#{action_hash['perform']} action not " << " available for this resource" @@ -89,5 +90,9 @@ module OpenNebulaJSON def clone(params=Hash.new) super(params['name']) end + + def rename(params=Hash.new) + super(params['name']) + end end end diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js index 1c121af5f7..f65e26bcc3 100644 --- a/src/sunstone/public/js/opennebula.js +++ b/src/sunstone/public/js/opennebula.js @@ -873,6 +873,13 @@ var OpenNebula = { var name = params.data.extra_param ? params.data.extra_param : ""; var action_obj = { "name" : name }; OpenNebula.Action.simple_action(params,OpenNebula.Image.resource, "clone", action_obj); + }, + "rename" : function(params){ + var action_obj = params.data.extra_param; + OpenNebula.Action.simple_action(params, + OpenNebula.Image.resource, + "rename", + action_obj); } }, diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index 49b9f44307..17617ee78a 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -314,16 +314,12 @@ var image_actions = { error: onError }, - "Image.update_dialog" : { - type: "custom", - call: popUpImageTemplateUpdateDialog - }, - - "Image.update" : { + "Image.update_template" : { type: "single", call: OpenNebula.Image.update, - callback: function() { - notifyMessage(tr("Image updated correctly")); + callback: function(request) { + notifyMessage("Template updated correctly"); + Sunstone.runAction('Image.showinfo',request.request.data[0]); }, error: onError }, @@ -437,7 +433,18 @@ var image_actions = { hideDialog(); $('div#images_tab div.legend_div').slideToggle(); } - } + }, + "Image.rename" : { + type: "single", + call: OpenNebula.Image.rename, + callback: function(request) { + notifyMessage("Image renamed correctly"); + Sunstone.runAction('Image.showinfo',request.request.data[0]); + Sunstone.runAction('Image.list'); + }, + error: onError, + notify: true + }, }; @@ -451,11 +458,6 @@ var image_buttons = { type: "create_dialog", text: tr('+ New') }, - "Image.update_dialog" : { - type: "action", - text: tr("Update properties"), - alwaysActive: true - }, "Image.chown" : { type: "confirm_with_select", text: tr("Change owner"), @@ -607,7 +609,7 @@ function updateImagesView(request, images_list){ function updateImageInfo(request,img){ var img_info = img.IMAGE; var info_tab = { - title: tr("Image information"), + title: tr("Information"), content: '\ \ @@ -619,9 +621,13 @@ function updateImageInfo(request,img){ \ \ \ - \ - \ - \ + \ + \ + \ + \ \ \ \ @@ -683,7 +689,10 @@ function updateImageInfo(request,img){ \ \ \ -
'+img_info.ID+'
'+tr("Name")+''+img_info.NAME+'
'+tr("Name")+''+img_info.NAME+'
\ + e\ +
\ +
'+tr("Datastore")+''+img_info.DATASTORE+'      '+tr("Other")+''+otherPermStr(img_info)+'
' + ' + insert_extended_template_table(img_info.TEMPLATE, + "Image", + img_info.ID) + + + insert_permissions_table("Image",img_info.ID) } var template_tab = { @@ -694,6 +703,25 @@ function updateImageInfo(request,img){ '' } + $("#div_edit_rename_link").die(); + $(".input_edit_value_rename").die(); + + // Listener for key,value pair edit action + $("#div_edit_rename_link").live("click", function() { + var value_str = $(".value_td_rename").text(); + $(".value_td_rename").html(''); + }); + + $(".input_edit_value_rename").live("change", function() { + var value_str = $(".input_edit_value_rename").val(); + if(value_str!="") + { + // Let OpenNebula know + var name_template = {"name": value_str}; + Sunstone.runAction("Image.rename",img_info.ID,name_template); + } + }); + Sunstone.updateInfoPanelTab("image_info_panel","image_info_tab",info_tab); Sunstone.updateInfoPanelTab("image_info_panel","image_template_tab",template_tab); @@ -970,126 +998,6 @@ function popUpCreateImageDialog(){ $create_image_dialog.dialog('open'); } - - -function setupImageTemplateUpdateDialog(){ - - //Append to DOM - dialogs_context.append('
'); - var dialog = $('#image_template_update_dialog',dialogs_context); - - //Put HTML in place - dialog.html(update_image_tmpl); - - var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window - //Convert into jQuery - dialog.dialog({ - autoOpen:false, - width:700, - modal:true, - height:height, - resizable:false - }); - - $('button',dialog).button(); - - $('#image_template_update_select',dialog).change(function(){ - var id = $(this).val(); - $('.permissions_table input',dialog).removeAttr('checked') - $('.permissions_table',dialog).removeAttr('update'); - if (id && id.length){ - var dialog = $('#image_template_update_dialog'); - $('#image_template_update_textarea',dialog).val(tr("Loading")+ - "..."); - - var img_persistent = is_persistent_image(id); - - if (img_persistent){ - $('#image_template_update_persistent',dialog).attr('checked','checked') - } else { - $('#image_template_update_persistent',dialog).removeAttr('checked') - }; - - Sunstone.runAction("Image.fetch_permissions",id); - Sunstone.runAction("Image.fetch_template",id); - } else { - $('#image_template_update_textarea',dialog).val(""); - }; - }); - - $('.permissions_table input',dialog).change(function(){ - $(this).parents('table').attr('update','update'); - }); - - $('form',dialog).submit(function(){ - var dialog = $(this); - var new_template = $('#image_template_update_textarea',dialog).val(); - var id = $('#image_template_update_select',dialog).val(); - if (!id || !id.length) { - $(this).parents('#image_template_update_dialog').dialog('close'); - return false; - }; - - var old_persistent = is_persistent_image(id); - var new_persistent = $('#image_template_update_persistent',dialog).is(':checked'); - if (old_persistent != new_persistent){ - if (new_persistent) Sunstone.runAction("Image.persistent",[id]); - else Sunstone.runAction("Image.nonpersistent",[id]); - }; - - var permissions = $('.permissions_table',dialog); - if (permissions.attr('update')){ - var perms = { - octet : buildOctet(permissions) - }; - Sunstone.runAction("Image.chmod",id,perms); - }; - - Sunstone.runAction("Image.update",id,new_template); - $(this).parents('#image_template_update_dialog').dialog('close'); - return false; - }); -}; - - -function popUpImageTemplateUpdateDialog(){ - var select = makeSelectOptions(dataTable_images, - 1,//id_col - 4,//name_col - [], - [] - ); - var sel_elems = getSelectedNodes(dataTable_images); - - - var dialog = $('#image_template_update_dialog'); - $('#image_template_update_select',dialog).html(select); - $('#image_template_update_textarea',dialog).val(""); - $('#image_template_update_persistent',dialog).removeAttr('checked'); - $('.permissions_table input',dialog).removeAttr('checked'); - $('.permissions_table',dialog).removeAttr('update'); - - - if (sel_elems.length >= 1){ //several items in the list are selected - //grep them - var new_select= sel_elems.length > 1? '' : ""; - $('option','').each(function(){ - var val = $(this).val(); - if ($.inArray(val,sel_elems) >= 0){ - new_select+=''; - }; - }); - $('#image_template_update_select',dialog).html(new_select); - if (sel_elems.length == 1) { - $('#image_template_update_select option',dialog).attr('selected','selected'); - $('#image_template_update_select',dialog).trigger("change"); - }; - }; - - dialog.dialog('open'); - return false; -}; - // Set the autorefresh interval for the datatable function setImageAutorefresh() { setInterval(function(){ @@ -1236,7 +1144,7 @@ $(document).ready(function(){ Sunstone.runAction("Image.list"); setupCreateImageDialog(); - setupImageTemplateUpdateDialog(); + /* setupImageTemplateUpdateDialog();*/ setupTips($create_image_dialog); setupImageActionCheckboxes(); setupImageCloneDialog();