etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Brian Federle 2011-11-07 17:08:46 -08:00
parent 1fd8f41ca5 650acd6845
commit 08d11f1901
1 changed files with 125 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
ui/scripts/accounts.js
View File

@ -604,7 +604,10 @@
url: createURL("listUsers&domainid=" + fromdb(accountObj.domainid) + "&account=" + todb(fromdb(accountObj.name))),
dataType: "json",
success: function(json) {
args.response.success({data: json.listusersresponse.user});
args.response.success({
actionFilter: userActionfilter,
data: json.listusersresponse.user
});
}
})
},
@ -729,7 +732,126 @@
});
}
},
changePassword: {
label: 'Change password',
messages: {
confirm: function(args) {
return 'Are you sure you want to change password?';
},
success: function(args) {
return 'Password is being changed.';
},
notification: function(args) {
return 'Changing password';
},
complete: function(args) {
return 'Password has been changed.';
}
},
createForm: {
label: 'Change password',
fields: {
newPassword: { label: 'New password' }
}
},
action: function(args) {
var password = args.data.newPassword;
if (md5Hashed)
password = $.md5(password);
$.ajax({
url: createURL("updateUser&id=" + args.context.users[0].id + "&password=" + password),
dataType: "json",
async: true,
success: function(json) {
args.response.success({data: json.updateuserresponse.user});
}
});
},
notification: {
poll: function(args) {
args.complete();
}
}
},
generateKeys: {
label: 'Generate keys',
messages: {
confirm: function(args) {
return 'Are you sure you want to generate keys?';
},
success: function(args) {
return 'Keys are being generated.';
},
notification: function(args) {
return 'Generating keys';
},
complete: function(args) {
return 'Keys have been generated.';
}
},
action: function(args) {
$.ajax({
url: createURL("registerUserKeys&id=" + args.context.users[0].id),
dataType: "json",
async: true,
success: function(json) {
args.response.success({data: json.registeruserkeysresponse.userkeys});
}
});
},
notification: {
poll: function(args) {
args.complete();
}
}
},
disable: {
label: 'Disable user',
messages: {
confirm: function(args) {
return 'Are you sure you want to disable this user?';
},
success: function(args) {
return 'User is being disabled.';
},
notification: function(args) {
return 'Disabling user';
},
complete: function(args) {
return 'User has been disabled.';
}
},
action: function(args) {
$.ajax({
url: createURL("disableUser&id=" + args.context.users[0].id),
dataType: "json",
async: true,
success: function(json) {
var jid = json.disableuserresponse.jobid;
args.response.success(
{_custom:
{jobId: jid,
getUpdatedItem: function(json) {
return json.queryasyncjobresultresponse.jobresult.user;
},
getActionFilter: function() {
return userActionfilter;
}
}
}
);
}
});
},
notification: {
poll: pollAsyncJobResult
}
}
},
tabs: {
details: {
@ -790,7 +912,7 @@
dataProvider: function(args) {
args.response.success(
{
actionFilter: accountActionfilter,
actionFilter: userActionfilter,
data:args.context.users[0]
}
);
@ -830,7 +952,7 @@
var userActionfilter = function(args) {
var jsonObj = args.context.item;
var allowedActions = [];
var allowedActions = [];
if(isAdmin()) {
allowedActions.push("edit");
allowedActions.push("changePassword");