bug 10409: create account - add domain suffix field

Jessica Wang · Jessica Wang · commit 2720bd572550 · 2011-12-14T10:24:31.000-08:00
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
@@ -115,6 +115,10 @@
                         items.push({id: p, description: timezoneMap[p]});
                       args.response.success({data: items});
                     }
+                  },
+                  networkdomain: { 
+                    label: 'Network domain',
+                    validation: { required: false }
                   }
                 }
               },
@@ -147,6 +151,9 @@
                 if(args.data.timezone != null && args.data.timezone.length > 0)
                   array1.push("&timezone=" + todb(args.data.timezone));
 
+                if(args.data.networkdomain != null && args.data.networkdomain.length > 0)
+                  array1.push("&networkdomain=" + todb(args.data.networkdomain));      
+                  
                 $.ajax({
                   url: createURL("createAccount" + array1.join("")),
                   dataType: "json",
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
@@ -146,9 +146,11 @@
 
             action: function(args) {
               var array1 = [];
-              array1.push("&name=" + todb(args.data.name));         
-              array1.push("&networkdomain=" + todb(args.data.networkdomain));              
               array1.push("&parentdomainid=" + args.context.domains[0].id);
+              array1.push("&name=" + todb(args.data.name));     
+              if(args.data.networkdomain != null && args.data.networkdomain.length > 0)              
+                array1.push("&networkdomain=" + todb(args.data.networkdomain));  
+                
               $.ajax({
                 url: createURL("createDomain" + array1.join("")),
                 dataType: "json",

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@`
`115`	`115`	`items.push({id: p, description: timezoneMap[p]});`
`116`	`116`	`args.response.success({data: items});`
`117`	`117`	`}`
	`118`	`+ },`
	`119`	`+ networkdomain: {`
	`120`	`+ label: 'Network domain',`
	`121`	`+ validation: { required: false }`
`118`	`122`	`}`
`119`	`123`	`}`
`120`	`124`	`},`
`@@ -147,6 +151,9 @@`
`147`	`151`	`if(args.data.timezone != null && args.data.timezone.length > 0)`
`148`	`152`	`array1.push("&timezone=" + todb(args.data.timezone));`
`149`	`153`
	`154`	`+ if(args.data.networkdomain != null && args.data.networkdomain.length > 0)`
	`155`	`+ array1.push("&networkdomain=" + todb(args.data.networkdomain));`
	`156`	`+`
`150`	`157`	`$.ajax({`
`151`	`158`	`url: createURL("createAccount" + array1.join("")),`
`152`	`159`	`dataType: "json",`