From f7d9ea291be808a33829172234164e188673d9ed Mon Sep 17 00:00:00 2001 From: Ilia Shakitko Date: Thu, 11 Sep 2014 12:25:09 +0200 Subject: [PATCH] Add "Edit Tags" functionality to SecurityGroup rules in UI Signed-off-by: Ilia Shakitko (cherry picked from commit 281c866206036235790773fbcb86edede0ac739d) --- ui/scripts/network.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index c0a920584d7..f6a8f3d4ca9 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'),