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 2014/01/17 21:13:22 UTC

git commit: updated refs/heads/master to 36920a3

Updated Branches:
  refs/heads/master a9733b5df -> 36920a3a3


CLOUDSTACK-5656: UI > Network > IP Address > configuration tab > Firewall > 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/36920a3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/36920a3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/36920a3a

Branch: refs/heads/master
Commit: 36920a3a3ba8b40329a7839ce6f27530bc915487
Parents: a9733b5
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 17 12:12:07 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 17 12:13:06 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36920a3a/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 166ce55..4e1ce05 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2960,6 +2960,10 @@
                                             'add-rule': {
                                                 label: 'label.add.rule',
                                                 addButton: true
+                                            },
+                                            'state' : {
+                                            	edit: 'ignore',
+                                            	label: 'label.state'
                                             }
                                         },