cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.4 to f7d9ea2
Date Thu, 11 Sep 2014 13:49:28 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 015276350 -> f7d9ea291


Add "Edit Tags" functionality to SecurityGroup rules in UI

Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
(cherry picked from commit 281c866206036235790773fbcb86edede0ac739d)


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

Branch: refs/heads/4.4
Commit: f7d9ea291be808a33829172234164e188673d9ed
Parents: 0152763
Author: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
Authored: Thu Sep 11 12:25:09 2014 +0200
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Thu Sep 11 15:48:59 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7d9ea29/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index c0a9205..f6a8f3d 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) {
@@ -4837,6 +4838,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: createURL('listSecurityGroups'),
@@ -5032,6 +5037,10 @@
                                         }
                                     },
                                     ignoreEmptyFields: true,
+                                    tags: cloudStack.api.tags({
+                                        resourceType: 'SecurityGroupRule',
+                                        contextId: 'multiRule'
+                                    }),
                                     dataProvider: function(args) {
                                         $.ajax({
                                             url: createURL('listSecurityGroups'),


Mime
View raw message