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/4.3 to ff0ac49
Date Fri, 17 Jan 2014 19:51:50 GMT
Updated Branches:
  refs/heads/4.3 b52e8028e -> ff0ac4911


CLOUDSTACK-5656: UI > Network > IP Address > configuration tab > Load Balancing
> add "State" column.


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

Branch: refs/heads/4.3
Commit: ff0ac49111d1d9eb11a8a8ef2c26f7158c3feebe
Parents: b52e802
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Jan 17 11:51:32 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jan 17 11:51:41 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff0ac491/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index c404b55..166ce55 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1615,6 +1615,10 @@
                                             'add-vm': {
                                                 label: 'label.add.vms',
                                                 addButton: true
+                                            },
+                                            'state' : {
+                                            	edit: 'ignore',
+                                            	label: 'label.state'
                                             }
                                         },
 
@@ -3435,6 +3439,11 @@
                                             'add-vm': {
                                                 label: 'label.add.vms',
                                                 addButton: true
+                                            },
+                                            
+                                            'state' : {
+                                            	edit: 'ignore',
+                                            	label: 'label.state'
                                             }
                                         },
 


Mime
View raw message