Repository: cloudstack
Updated Branches:
  refs/heads/master 4f3de024d -> 281c86620


Add "Edit Tags" functionality to SecurityGroup rules in UI

Signed-off-by: Ilia Shakitko <[email protected]>


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

Branch: refs/heads/master
Commit: 281c866206036235790773fbcb86edede0ac739d
Parents: 4f3de02
Author: Ilia Shakitko <[email protected]>
Authored: Thu Sep 11 12:25:09 2014 +0200
Committer: Wei Zhou <[email protected]>
Committed: Thu Sep 11 15:47:21 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281c8662/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 8a758c8..02dd269 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -22,7 +22,8 @@
             protocol: elem.protocol,
             startport: elem.startport,
             endport: elem.endport,
-            cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', 
elem.securitygroupname)
+            cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', 
elem.securitygroupname),
+            tags: elem.tags
         };
 
         if (elemData.startport == 0 && elemData.endport) {
@@ -4842,6 +4843,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: 
createURL('listSecurityGroups'),
@@ -5037,6 +5042,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: 
createURL('listSecurityGroups'),

Reply via email to