Displaying ACL name as None if acl is not associated with a tier
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73c381ab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73c381ab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73c381ab Branch: refs/heads/vpc_simulator Commit: 73c381abdecfeb3b373769e228faf42a4c13c78f Parents: ecd52e0 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Tue Jun 4 20:22:02 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Tue Jun 4 21:41:34 2013 +0530 ---------------------------------------------------------------------- ui/scripts/vpc.js | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73c381ab/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index ebfcc3b..c186b15 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -2746,7 +2746,8 @@ async: true, success: function(json) { var jsonObj = json.listnetworksresponse.network[0]; - + if(jsonObj.aclid != null){ + $.ajax({ url:createURL("listNetworkACLLists&id=" + jsonObj.aclid), dataType:"json", @@ -2763,6 +2764,16 @@ args.response.error(parseXMLHttpResponse(json)); } }); + } + + else{ + args.response.success({ + actionFilter: cloudStack.actionFilter.guestNetwork, + data:$.extend(jsonObj,{aclname:'None'}) + + }); + + } } }); }
