Updated Branches: refs/heads/master f4a7f1218 -> 11a25b3b9
Providing acl id option while creating a tier Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11a25b3b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11a25b3b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11a25b3b Branch: refs/heads/master Commit: 11a25b3b9a1de955467e3afd5fed52cf2297536e Parents: f4a7f12 Author: Pranav Saxena <[email protected]> Authored: Wed Jun 5 16:42:31 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Wed Jun 5 16:42:31 2013 +0530 ---------------------------------------------------------------------- ui/scripts/vpc.js | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11a25b3b/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index de70d2a..bc39480 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -3155,7 +3155,28 @@ label: 'label.netmask', docID: 'helpTierNetmask', validation: { required: true } - } + }, + + aclid:{ + label:'ACL', + select:function(args){ + $.ajax({ + url: createURL('listNetworkACLLists&vpcid=' +args.context.vpc[0].id), + dataType: 'json', + async: true, + success: function(json) { + var objs = json.listnetworkacllistsresponse.networkacllist; + var items = []; + items.push({id:'',description:''}); + $(objs).each(function() { + + items.push({id: this.id, description: this.name}); + }); + args.response.success({data: items}); + } + }); + } + } }, action: function(args) { @@ -3171,6 +3192,10 @@ netmask: args.data.netmask }; + if(args.data.aclid !='') + $.extend(dataObj, {aclid:args.data.aclid}); + + $.ajax({ url: createURL('createNetwork'), dataType: 'json',
