Skip to content

Commit 8692f68

Browse files
author
Jessica Wang
committed
CS-16573: cloudstack UI - create user - encode data passed to API call.
1 parent bfbf634 commit 8692f68

1 file changed

Lines changed: 31 additions & 21 deletions

File tree

ui/scripts/accounts.js

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -888,29 +888,39 @@
888888
action: function(args) {
889889
var accountObj = args.context.accounts[0];
890890

891-
var array1 = [];
892-
array1.push("&username=" + todb(args.data.username));
893-
891+
var data = {
892+
username: args.data.username
893+
};
894+
894895
var password = args.data.password;
895-
if (md5Hashed)
896-
password = $.md5(password);
897-
else
898-
password = todb(password);
899-
array1.push("&password=" + password);
900-
901-
array1.push("&email=" + todb(args.data.email));
902-
array1.push("&firstname=" + todb(args.data.firstname));
903-
array1.push("&lastname=" + todb(args.data.lastname));
904-
if(args.data.timezone != null && args.data.timezone.length > 0)
905-
array1.push("&timezone=" + todb(args.data.timezone));
906-
907-
array1.push("&domainid=" + accountObj.domainid);
908-
array1.push("&account=" + todb(accountObj.name));
909-
array1.push("&accounttype=" + accountObj.accounttype);
910-
896+
if (md5Hashed) {
897+
password = $.md5(password);
898+
}
899+
$.extend(data, {
900+
password: password
901+
});
902+
903+
$.extend(data, {
904+
email: args.data.email,
905+
firstname: args.data.firstname,
906+
lastname: args.data.lastname
907+
});
908+
909+
if(args.data.timezone != null && args.data.timezone.length > 0) {
910+
$.extend(data, {
911+
timezone: args.data.timezone
912+
});
913+
}
914+
915+
$.extend(data, {
916+
domainid: accountObj.domainid,
917+
account: accountObj.name,
918+
accounttype: accountObj.accounttype
919+
});
920+
911921
$.ajax({
912-
url: createURL("createUser" + array1.join("")),
913-
dataType: "json",
922+
url: createURL('createUser'),
923+
data: data,
914924
success: function(json) {
915925
var item = json.createuserresponse.user;
916926
args.response.success({data: item});

0 commit comments

Comments
 (0)