CS-16573: cloudstack UI - update instance - encode data passed to API call.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/221f2217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/221f2217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/221f2217

Branch: refs/heads/marvin-parallel
Commit: 221f2217ac2a0cf2c45bb3ee03e9252b9663467a
Parents: a5f4a67
Author: Jessica Wang <[email protected]>
Authored: Mon Oct 22 17:00:41 2012 -0700
Committer: Prasanna Santhanam <[email protected]>
Committed: Thu Oct 25 13:47:33 2012 +0530

----------------------------------------------------------------------
 ui/scripts/instances.js |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/221f2217/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index b70b8fc..e58fc82 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -453,17 +453,21 @@
           edit: {
             label: 'label.edit',
             action: function(args) {
-              var array1 = [];                                                 
-                                                       
if(args.data.displayname != args.context.instances[0].displayname)
-                array1.push("&displayName=" + args.data.displayname);
-                                                               
-              array1.push("&group=" + args.data.group);
-              array1.push("&ostypeid=" + args.data.guestosid);
-              //array1.push("&haenable=" + haenable);
+                                                 var data = {
+                                                         id: 
args.context.instances[0].id,
+                                                         group: 
args.data.group,
+                                                               ostypeid: 
args.data.guestosid
+                                                       };
+                                                                               
                        
+                                                       
if(args.data.displayname != args.context.instances[0].displayname) {
+                                                         $.extend(data, {
+                                                                 displayName: 
args.data.displayname
+                                                               });             
                                        
+                                                       }                       
                                        
 
               $.ajax({
-                url: createURL("updateVirtualMachine&id=" + 
args.context.instances[0].id + array1.join("")),
-                dataType: "json",
+                url: createURL('updateVirtualMachine'),
+                data: data,
                 success: function(json) {
                   var item = json.updatevirtualmachineresponse.virtualmachine;
                   args.response.success({data:item});

Reply via email to