From 00715c9b86e830f10065e020ff27cc2d5112c94b Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 4 Jun 2013 20:22:02 +0530 Subject: [PATCH] Displaying ACL name as None if acl is not associated with a tier --- ui/scripts/vpc.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index ebfcc3b7b56..55f84f5a1ea 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'}) + + }); + + } } }); }