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/ui-ucs to 0731138
Date Fri, 17 May 2013 23:52:36 GMT
Updated Branches:
  refs/heads/ui-ucs 134fabe5f -> 07311382e


CLOUDSTACK - UCS - populate dummy data for UCS dn.


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

Branch: refs/heads/ui-ucs
Commit: 07311382edfc9b6fd0600870d5ecd8e8429b5eea
Parents: 134fabe
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri May 17 16:51:26 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri May 17 16:52:25 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07311382/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a9630a7..f1b1604 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10989,8 +10989,8 @@
                 title: 'Blades',
                 listView: {
                   fields: {
-                    fieldA: { label: 'Field A' },
-                    fieldB: { label: 'Field B' }
+                    dn: { label: 'Distinguished Name' },
+                    associatedProfileDn: { label: 'Associated Profile' }
                   },
                   dataProvider: function(args) {                    
                     /*
@@ -11006,8 +11006,9 @@
                     */                    
                     args.response.success({
                       data: [
-                        { fieldA: 'fieldA1', fieldB: 'fieldB1' },
-                        { fieldA: 'fieldA2', fieldB: 'fieldB2' }
+                        { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9',
dn: 'sys/chassis-2/blade-2', associatedProfileDn: 'profile_2' },
+                        { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9',
dn: 'sys/chassis-1/blade-1', associatedProfileDn: 'profile_1' },
+                        { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413', hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9',
dn: 'sys/chassis-3/blade-3', associatedProfileDn: '' }
                       ]
                     });                  
                   },                  
@@ -11039,8 +11040,9 @@
                               });
                               */
                               
-                              items.push({id: 'aaa', description: 'aaa'});
-                              items.push({id: 'bbb', description: 'bbb'});
+                              items.push({id: 'profile_1', description: 'profile_1'});
+                              items.push({id: 'profile_2', description: 'profile_2'});
+                              items.push({id: 'profile_3', description: 'profile_3'});
                               args.response.success({data: items});
                             },
                             validation: { required: true }
@@ -11061,7 +11063,7 @@
                           }
                         });
                         */
-                        args.response.success();
+                        args.response.success({data: { id: '85a2ff00-ed42-4a18-8f5f-bb75c9ffd413',
hostId: '62be4b10-a828-4ea2-aed8-9ad1d0812ff9', dn: 'sys/chassis-2/blade-2', associatedProfileDn:
'profile_3' }});
                       },
                       notification: {
                         poll: function(args) {
@@ -11102,8 +11104,9 @@
                                 });
                                 */
                                 
-                                items.push({id: 'aaa', description: 'aaa'});
-                                items.push({id: 'bbb', description: 'bbb'});
+                                items.push({id: 'profile_1', description: 'profile_1'});
+                                items.push({id: 'profile_2', description: 'profile_2'});
+                                items.push({id: 'profile_3', description: 'profile_3'});
                                 args.response.success({data: items});
                               },
                               validation: { required: true }


Mime
View raw message