User accounts UI: Support for regions -Add region select to add account form
-Show account's region in detail view Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fdaa5b49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fdaa5b49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fdaa5b49 Branch: refs/heads/ui-multiple-nics Commit: fdaa5b4909130964e60670a8b63bd2cb0c57c8a8 Parents: 79bfbe3 Author: Brian Federle <[email protected]> Authored: Wed Feb 27 08:59:55 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Wed Feb 27 08:59:55 2013 -0800 ---------------------------------------------------------------------- ui/scripts/accounts.js | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fdaa5b49/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 4c327ee..3727f8e 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -113,6 +113,31 @@ validation: { required: true }, docID: 'helpAccountLastName' }, + regionid: { + label: 'label.region', + select: function(args) { + $.ajax({ + url: createURL('listRegions&listAll=true'), + success: function(json) { + var regions = json.listregionsresponse.region; + var regionOptions; + + if (!regions) { + regionOptions = [{ id: 0, description: '0 - Default' }]; + } else { + regionOptions = $(regions).map(function(index, region) { + return { + id: region.id, + description: region.id + ' - ' + region.name + }; + }); + } + + args.response.success({ data: regionOptions }); + } + }); + } + }, domainid: { label: 'label.domain', docID: 'helpAccountDomain', @@ -181,7 +206,7 @@ action: function(args) { var data = { - username: args.data.username + username: args.data.username, }; var password = args.data.password; @@ -196,6 +221,7 @@ email: args.data.email, firstname: args.data.firstname, lastname: args.data.lastname, + regionid: args.data.regionid, domainid: args.data.domainid }); @@ -290,7 +316,8 @@ domainid: accountObj.domainid, account: accountObj.name, newname: args.data.name, - networkdomain: args.data.networkdomain + networkdomain: args.data.networkdomain, + regionid: accountObj.regionid ? accountObj.regionid : 0 }; $.ajax({ @@ -634,6 +661,7 @@ return cloudStack.converters.toRole(args); } }, + regionid: { label: 'label.region' }, domain: { label: 'label.domain' }, state: { label: 'label.state' }, networkdomain: {
