apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 02:53:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 UI - Make Account page/User page available to normal-user role.

Browse Source
This commit is contained in:
Jessica Wang 2012-03-05 11:33:46 -08:00
parent 1cd4ef5f07
commit 1dbd10e5e9
2 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ui/scripts/accounts.js
View File

@ -619,16 +619,24 @@
} }
var accountObj = args.context.accounts[0]; var accountObj = args.context.accounts[0];
$.ajax({ if(isAdmin() || isDomainAdmin()) {
url: createURL("listUsers&domainid=" + accountObj.domainid + "&account=" + accountObj.name + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), $.ajax({
dataType: "json", url: createURL("listUsers&domainid=" + accountObj.domainid + "&account=" + accountObj.name + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
success: function(json) { dataType: "json",
args.response.success({ success: function(json) {
actionFilter: userActionfilter, args.response.success({
data: json.listusersresponse.user actionFilter: userActionfilter,
}); data: json.listusersresponse.user
} });
}) }
})
}
else { //normal user doesn't have access listUsers API until Bug 14127 is fixed.
args.response.success({
actionFilter: userActionfilter,
data: accountObj.user
});
}
}, },
actions: { actions: {
add: { add: {
@ -970,18 +978,26 @@
], ],
dataProvider: function(args) { dataProvider: function(args) {
$.ajax({ if(isAdmin() || isDomainAdmin()) {
url: createURL('listUsers'), $.ajax({
data: { url: createURL('listUsers'),
id: args.context.users[0].id data: {
}, id: args.context.users[0].id
success: function(json) { },
args.response.success({ success: function(json) {
actionFilter: userActionfilter, args.response.success({
data: json.listusersresponse.user[0] actionFilter: userActionfilter,
}); data: json.listusersresponse.user[0]
} });
}); }
});
}
else { //normal user doesn't have access listUsers API until Bug 14127 is fixed.
args.response.success({
actionFilter: userActionfilter,
data: args.context.users[0]
});
}
} }
} }
} }
@ -1013,8 +1029,11 @@
} }
allowedActions.push("remove"); allowedActions.push("remove");
} }
} allowedActions.push("updateResourceCount");
allowedActions.push("updateResourceCount"); }
else if(isDomainAdmin()) {
allowedActions.push("updateResourceCount");
}
return allowedActions; return allowedActions;
} }

4
ui/scripts/cloudStack.js
View File

@ -10,10 +10,10 @@
return ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects"]; return ["dashboard", "instances", "storage", "network", "templates", "accounts", "domains", "events", "projects"];
} }
else if (g_userProjectsEnabled) { else if (g_userProjectsEnabled) {
return ["dashboard", "instances", "storage", "network", "templates", "events", "projects"]; return ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects"];
} }
else { //normal user else { //normal user
return ["dashboard", "instances", "storage", "network", "templates", "events"]; return ["dashboard", "instances", "storage", "network", "templates", "accounts", "events"];
} }
}, },
sections: { sections: {