You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/11/25 23:32:37 UTC

git commit: updated refs/heads/4.3 to cd5ecfb

Updated Branches:
  refs/heads/4.3 e8e1fd586 -> cd5ecfb76


CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by cluster > detailView > add pod name, zone name.


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

Branch: refs/heads/4.3
Commit: cd5ecfb763b764986656280263a812d5d7b312d4
Parents: e8e1fd5
Author: Jessica Wang <je...@apache.org>
Authored: Mon Nov 25 14:32:16 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Nov 25 14:32:16 2013 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd5ecfb7/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index e7c535e..f0e4cfd 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9070,8 +9070,6 @@
                             }
                         }
                     },
-                    
-                    //???
                     routerGroupByCluster: {
                         id: 'routerGroupByCluster',
                         type: 'select',
@@ -9229,6 +9227,12 @@
                                                         return 'No';
                                                     }
                                                 }
+                                            },
+                                            podname: {
+                                            	label: 'label.pod'
+                                            },
+                                            zonename: {
+                                            	label: 'zone'
                                             }
                                         }],
                                         dataProvider: function (args) {
@@ -9287,8 +9291,7 @@
                                 }
                             }
                         }
-                    }
-                    //???
+                    }                    
                 }
             },
             systemVms: {