Updated Branches: refs/heads/master bc98d8ab4 -> 8c9cd6e0c
nTIER - detail view to show the acl name with which it is associated Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c9cd6e0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c9cd6e0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c9cd6e0 Branch: refs/heads/master Commit: 8c9cd6e0ca4eebe3fd1f4a0116e4866223d1180d Parents: bc98d8a Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Fri May 31 11:55:17 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Fri May 31 11:55:17 2013 +0530 ---------------------------------------------------------------------- ui/scripts/vpc.js | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c9cd6e0/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 81f3818..8f98414 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -2731,6 +2731,7 @@ isEditable: true }, + aclname:{label:'ACL name'}, aclid:{label:'ACL id'}, domain: { label: 'label.domain' }, @@ -2745,12 +2746,23 @@ async: true, success: function(json) { var jsonObj = json.listnetworksresponse.network[0]; - args.response.success( - { - actionFilter: cloudStack.actionFilter.guestNetwork, - data: jsonObj - } - ); + + $.ajax({ + url:createURL("listNetworkACLLists&id=" + jsonObj.aclid), + dataType:"json", + success:function(json){ + var aclObj = json.listnetworkacllistsresponse.networkacllist[0]; + args.response.success({ + actionFilter: cloudStack.actionFilter.guestNetwork, + data:$.extend(jsonObj , {aclname: aclObj.name}) + + }); + }, + error:function(json){ + + args.response.error(parseXMLHttpResponse(json)); + } + }); } }); }
