Updated Branches: refs/heads/master d80debcbf -> c0c0ae1c3
cloudstack UI - advanced search on VPC page - add domain dropdown, account text field. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c0c0ae1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c0c0ae1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c0c0ae1c Branch: refs/heads/master Commit: c0c0ae1c36bfc7c52e04cc481e21efdfc243803f Parents: d80debc Author: Jessica Wang <[email protected]> Authored: Thu Oct 4 14:10:30 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Oct 4 14:22:39 2012 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c0c0ae1c/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 86ef9dc..a4f4a4d 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3680,7 +3680,46 @@ } }); } - }, + }, + domainid: { + label: 'Domain', + select: function(args) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } + } + args.response.success({ + data: array1 + }); + } + }); + }, + isHidden: function(args) { + if(isAdmin() || isDomainAdmin()) + return false; + else + return true; + } + }, + account: { + label: 'Account', + isHidden: function(args) { + if(isAdmin() || isDomainAdmin()) + return false; + else + return true; + } + }, tagKey: { label: 'Tag Key' }, tagValue: { label: 'Tag Value' } },
