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/10 01:11:14 UTC

git commit: updated refs/heads/4.3 to d758996

Updated Branches:
  refs/heads/4.3 9583c47a3 -> d758996b7


CLOUDSTACK-5656: UI > network > IP Address > configuration tab > Port Forwarding > 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/d758996b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d758996b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d758996b

Branch: refs/heads/4.3
Commit: d758996b711458ae1442ebf72a926ec66bdc915f
Parents: 9583c47
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Jan 9 16:10:07 2014 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Jan 9 16:10:41 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d758996b/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d352320..610b1bdc 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3933,6 +3933,10 @@
                                                     });
                                                 }
                                             },
+                                            'state' : {
+                                            	edit: 'ignore',
+                                            	label: 'label.state'
+                                            },
                                             'add-vm': {
                                                 label: 'label.add.vm',
                                                 addButton: true
@@ -3993,7 +3997,10 @@
                                                     success: function(data) {
                                                         args.response.success({
                                                             _custom: {
-                                                                jobId: data.createportforwardingruleresponse.jobid
+                                                                jobId: data.createportforwardingruleresponse.jobid,
+                                                                getUpdatedItem: function(json) {                                                        	        
+                                                                    return json.queryasyncjobresultresponse.jobresult.portforwardingrule;
+                                                                }
                                                             },
                                                             notification: {
                                                                 label: 'label.add.port.forwarding.rule',