You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/06/04 16:52:40 UTC
git commit: updated refs/heads/master to 00715c9
Updated Branches:
refs/heads/master b5148af0c -> 00715c9b8
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/00715c9b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00715c9b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00715c9b
Branch: refs/heads/master
Commit: 00715c9b86e830f10065e020ff27cc2d5112c94b
Parents: b5148af
Author: Pranav Saxena <pr...@citrix.com>
Authored: Tue Jun 4 20:22:02 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Tue Jun 4 20:22:02 2013 +0530
----------------------------------------------------------------------
ui/scripts/vpc.js | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00715c9b/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index ebfcc3b..55f84f5 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'})
+
+ });
+
+ }
}
});
}