You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/10/04 23:22:18 UTC
git commit: cloudstack UI - advanced search on guest network page -
add domain dropdown, account text field.
Updated Branches:
refs/heads/master 10d1a0cc6 -> d80debcbf
cloudstack UI - advanced search on guest network 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/d80debcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d80debcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d80debcb
Branch: refs/heads/master
Commit: d80debcbfe497eef40bbf93b3f5f2b3d5b2b06cc
Parents: 10d1a0c
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Oct 4 14:07:08 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Oct 4 14:22:03 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/d80debcb/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 834869e..86ef9dc 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -463,7 +463,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' }
},