From ff0a469cb1a5bc80c2443f3e76147cb7aaffa283 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Wed, 26 Oct 2011 19:04:31 +0200
Subject: [PATCH] Task #933: Re-enable image type when doing save_as of a VM

---
 .../models/OpenNebulaJSON/VirtualMachineJSON.rb |  2 +-
 src/sunstone/public/js/plugins/vms-tab.js       | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb
index 40488754d6..d00c0efc32 100644
--- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb
+++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb
@@ -88,7 +88,7 @@ module OpenNebulaJSON
         end
 
         def save_as(params=Hash.new)
-            super(params['disk_id'].to_i, params['image_name'])
+            super(params['disk_id'].to_i, params['image_name'], params['type'])
         end
 
         def chown(params=Hash.new)
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index e7b099b7ce..c3959d6d22 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -812,7 +812,7 @@ function setupSaveasDialog(){
             var id = $('#vm_id',this).text();
             var disk_id = $('#vm_disk_id',this).val();
             var image_name = $('#image_name',this).val();
-            //var type = $('#image_type',this).val();
+            var type = $('#image_type',this).val();
 
             if (!id.length || !disk_id.length || !image_name.length) {
                 notifyError("Skipping VM "+id+
@@ -821,8 +821,8 @@ function setupSaveasDialog(){
             else {
                 var obj = {
                     disk_id : disk_id,
-                    image_name : image_name
-                    //type: type
+                    image_name : image_name,
+                    type: type
                 };
                 args.push(id);
                 Sunstone.runAction("VM.saveas",id,obj);
@@ -865,20 +865,15 @@ function popUpSaveasDialog(elems){
                 <label for="image_name">Image name:</label>\
                 <input type="text" id="image_name" name="image_name" value="" />\
             </div>\
-            <!-- not used anymore\
             <div>\
                 <label for="img_attr_value">Type:</label>\
                 <select id="image_type" name="image_type">\
-                    <option value="">Default</option>\
-                    <option value="disk">Disk</option>\
-                    <option value="floppy">Floppy</option>\
+                    <option value="">Default (current image type)</option>\
+                    <option value="os">OS</option>\
+                    <option value="datablock">Datablock</option>\
                     <option value="cdrom">CD-ROM</option>\
-                    <option value="swap">Swap</option>\
-                    <option value="fs">FS</option>\
-                    <option value="block">Block</option>\
                 </select>\
             </div>\
-            -->\
             </fieldset>\
         </div>';
         $('#saveas_tabs',dialog).append(tab);