cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [12/50] [abbrv] git commit: refs/heads/ui-multiple-pod-ranges - CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - remove region field from Add Account dialog since createAccount API does not take in regionid parameter.
Date Mon, 25 Mar 2013 17:52:12 GMT
CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - remove region field from Add Account dialog
since createAccount API does not take in regionid parameter.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9270b433
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9270b433
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9270b433

Branch: refs/heads/ui-multiple-pod-ranges
Commit: 9270b4335c12e410be52092b02da723b1a0c7b5b
Parents: 5a9ccce
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Wed Mar 20 16:47:52 2013 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Wed Mar 20 16:47:52 2013 -0700

----------------------------------------------------------------------
 ui/scripts/accounts.js |   36 ++++--------------------------------
 1 files changed, 4 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9270b433/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 3727f8e..3403337 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -112,32 +112,7 @@
                     label: 'label.last.name',
                     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',
@@ -220,8 +195,7 @@
                 $.extend(data, {
 								  email: args.data.email,
                   firstname: args.data.firstname,
-                  lastname: args.data.lastname,
-                  regionid: args.data.regionid,
+                  lastname: args.data.lastname,                 
                   domainid: args.data.domainid									
 								});								              
 
@@ -316,8 +290,7 @@
 									  domainid: accountObj.domainid,
 										account: accountObj.name,
 										newname: args.data.name,
-										networkdomain: args.data.networkdomain,
-                    regionid: accountObj.regionid ? accountObj.regionid : 0
+										networkdomain: args.data.networkdomain                    
 									};
                 
                   $.ajax({
@@ -660,8 +633,7 @@
                       converter: function(args){
                         return cloudStack.converters.toRole(args);
                       }
-                    },
-                    regionid: { label: 'label.region' },
+                    },                    
                     domain: { label: 'label.domain' },
                     state: { label: 'label.state' },
                     networkdomain: {


Mime
View raw message