shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Feature #1742: Add secondary groups to sunstone user tab

Browse Source
This commit is contained in:
Carlos Martín 2013-09-04 16:21:34 +02:00
parent b00f9e9c34
commit c7bb778c56
6 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/etc/sunstone-views/admin.yaml
View File

@ -54,6 +54,8 @@ tabs:
User.update_password: true
User.quotas_dialog: true
User.chgrp: true
User.addgroup: true
User.delgroup: true
User.chauth: true
User.delete: true
groups-tab:

2
src/sunstone/etc/sunstone-views/cloud.yaml
View File

@ -55,6 +55,8 @@ tabs:
User.update_password: true
User.quotas_dialog: true
User.chgrp: true
User.addgroup: true
User.delgroup: true
User.chauth: true
User.delete: true
groups-tab:

2
src/sunstone/etc/sunstone-views/user.yaml
View File

@ -55,6 +55,8 @@ tabs:
User.update_password: true
User.quotas_dialog: true
User.chgrp: true
User.addgroup: true
User.delgroup: true
User.chauth: true
User.delete: true
groups-tab:

2
src/sunstone/etc/sunstone-views/vdcadmin.yaml
View File

@ -55,6 +55,8 @@ tabs:
User.update_password: true
User.quotas_dialog: true
User.chgrp: true
User.addgroup: true
User.delgroup: true
User.chauth: true
User.delete: true
groups-tab:

21
src/sunstone/public/js/opennebula.js
View File

@ -936,18 +936,17 @@ var OpenNebula = {
"set_quota" : function(params){
var action_obj = { quotas : params.data.extra_param };
OpenNebula.Action.simple_action(params,OpenNebula.User.resource,"set_quota",action_obj);
},
"addgroup" : function(params){
var action_obj = {"group_id": params.data.extra_param };
OpenNebula.Action.simple_action(params,OpenNebula.User.resource,
"addgroup",action_obj);
},
"delgroup" : function(params){
var action_obj = {"group_id": params.data.extra_param };
OpenNebula.Action.simple_action(params,OpenNebula.User.resource,
"delgroup",action_obj);
}
// "addgroup" : function(params){
// var action_obj = {"group_id": params.data.extra_param };
// OpenNebula.Action.simple_action(params,OpenNebula.User.resource,
// "addgroup",action_obj);
// },
// "delgroup" : function(params){
// var action_obj = {"group_id": params.data.extra_param };
// OpenNebula.Action.simple_action(params,OpenNebula.User.resource,
// "delgroup",action_obj);
// }
},
"Image": {

42
src/sunstone/public/js/plugins/users-tab.js
View File

@ -427,7 +427,26 @@ var user_actions = {
error: onError,
notify: true
},
"User.addgroup" : {
type: "multiple",
call: OpenNebula.User.addgroup,
callback : function(req){
Sunstone.runAction("User.show",req.request.data[0][0]);
},
elements : userElements,
error: onError,
notify: true
},
"User.delgroup" : {
type: "multiple",
call: OpenNebula.User.delgroup,
callback : function(req){
Sunstone.runAction("User.show",req.request.data[0][0]);
},
elements : userElements,
error: onError,
notify: true
},
"User.change_authentication" : {
type: "custom",
call: popUpChangeAuthenticationDialog
@ -561,6 +580,22 @@ var user_buttons = {
tip: tr("This will change the main group of the selected users. Select the new group")+":",
condition: mustBeAdmin
},
"User.addgroup" : {
type: "confirm_with_select",
text: tr("Add to group"),
layout: "user_select",
select: groups_sel,
tip: tr("This will add the user to a secondary group. Select the new group")+":",
condition: mustBeAdmin
},
"User.delgroup" : {
type: "confirm_with_select",
text: tr("Remove from group"),
layout: "user_select",
select: groups_sel,
tip: tr("This will remove the user from a secondary group. Select the group")+":",
condition: mustBeAdmin
},
"User.delete" : {
type: "confirm",
text: tr("Delete"),
@ -722,6 +757,11 @@ function updateUserInfo(request,user){
<tr>' +
insert_group_dropdown("User",info.ID,info.GNAME,info.GID) +
'</tr>\
<tr>\
<td class="key_td">' + tr("Secondary groups") + '</td>\
<td class="value_td">'+(typeof info.GROUPS.ID == "object" ? info.GROUPS.ID.join(",") : "-")+'</td>\
<td></td>\
</tr>\
<tr>\
<td class="key_td">' + tr("Authentication driver") + '</td>\
<td class="value_td">'+info.AUTH_DRIVER+'</td>\