cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to bc8f323
Date Tue, 09 Jul 2013 21:31:27 GMT
Updated Branches:
  refs/heads/master 70c4a97ea -> bc8f32363


CLOUDSTACK-3427: UI > UCS manager > implement addUcsManager API.


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

Branch: refs/heads/master
Commit: bc8f32363e3db60ef0dfc87926d9ed0bb18a10c5
Parents: 70c4a97
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jul 9 14:30:34 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jul 9 14:30:34 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc8f3236/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 009c736..8393c2a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13038,21 +13038,18 @@
                     name: args.data.name
                   });
                 }
-                /*
+                               
                 $.ajax({
                   url: createURL('addUcsManager'),
                   data: data,                 
-                  success: function(json) {
-                    
+                  success: function(json) { //e.g. json == { "addUcsManagerResponse" :  {
"ucsmanager" : {"id":"11","name":"ucsmanager","url":"10.223.184.2","zoneid":"2"} }  }
+                    var item = json.addUcsManagerResponse.ucsmanager;
+                    args.response.success({ data: item });
                   },
                   error: function(data) {
                     args.response.error(parseXMLHttpResponse(data));
                   }
-                });
-                */
-                
-                args.response.success({data:  { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413',
name: 'UCS Manager 3', url: '10.196.72.3' }});
-                
+                });   
               },
 
               notification: {


Mime
View raw message