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 2868f36
Date Mon, 23 Dec 2013 18:56:23 GMT
Updated Branches:
  refs/heads/master 3da5de545 -> 2868f36db


CLOUDSTACK-5612: UI > Network > Guest Networks > detailView > to distinguish between
non-vpc network and vpc network(tier) easier, move VPC ID field up.


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

Branch: refs/heads/master
Commit: 2868f36dbda465053ed3fbe2d634e48acc22892a
Parents: 3da5de5
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Dec 23 10:55:10 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Dec 23 10:56:12 2013 -0800

----------------------------------------------------------------------
 ui/scripts/network.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2868f36d/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 84932e0..9eaf028 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1151,6 +1151,16 @@
                                         label: 'label.state'
                                     },
 
+                                    vpcid: {
+                                        label: 'label.vpc.id',
+                                        converter: function(args) {
+                                            if (args != null)
+                                                return args;
+                                            else
+                                                return 'N/A';
+                                        }
+                                    },
+                                    
                                     ispersistent: {
                                         label: 'Persistent ',
                                         converter: cloudStack.converters.toBooleanText
@@ -1260,16 +1270,6 @@
                                     },
                                     account: {
                                         label: 'label.account'
-                                    },
-
-                                    vpcid: {
-                                        label: 'label.vpc.id',
-                                        converter: function(args) {
-                                            if (args != null)
-                                                return args;
-                                            else
-                                                return 'N/A';
-                                        }
                                     }
                                 }],
 


Mime
View raw message