mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the provisioning api in the user management to handle group memberships 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-01-18 14:35:30 +01:00
parent 5d1f7e5a7b
commit 89801f76ea
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/js/users/groups.js
View File

@ -225,7 +225,9 @@ GroupList = {
toggleAddGroup: function (event) {
if (GroupList.isAddGroupButtonVisible()) {
event.stopPropagation();
if (event) {
event.stopPropagation();
}
$('#newgroup-form').show();
$('#newgroup-init').hide();
$('#newgroupname').focus();

77
settings/js/users/users.js
View File

@ -420,42 +420,63 @@ var UserList = {
var $element = $(element);
var checkHandler = null;
var addUserToGroup = null,
removeUserFromGroup = null;
if(user) { // Only if in a user row, and not the #newusergroups select
checkHandler = function (group) {
if (user === OC.currentUser && group === 'admin') {
var handleUserGroupMembership = function (group, add) {
if (user === OC.getCurrentUser().uid && group === 'admin') {
return false;
}
if (!OC.isUserAdmin() && checked.length === 1 && checked[0] === group) {
return false;
}
$.post(
OC.filePath('settings', 'ajax', 'togglegroups.php'),
{
username: user,
group: group
},
function (response) {
if (response.status === 'success') {
GroupList.update();
var groupName = response.data.groupname;
if (UserList.availableGroups.indexOf(groupName) === -1 &&
response.data.action === 'add'
) {
UserList.availableGroups.push(groupName);
}
if (response.data.action === 'add') {
GroupList.incGroupCount(groupName);
} else {
GroupList.decGroupCount(groupName);
}
if (add && OC.isUserAdmin() && UserList.availableGroups.indexOf(group) === -1) {
GroupList.createGroup(group);
if (UserList.availableGroups.indexOf(group) === -1) {
UserList.availableGroups.push(group);
}
}
$.ajax({
url: OC.linkToOCS('cloud/users/' + user , 2) + 'groups',
data: {
groupid: group
},
type: add ? 'POST' : 'DELETE',
beforeSend: function (request) {
request.setRequestHeader('Accept', 'application/json');
},
success: function() {
GroupList.update();
if (add && UserList.availableGroups.indexOf(group) === -1) {
UserList.availableGroups.push(group);
}
if (response.data.message) {
OC.Notification.show(response.data.message);
if (add) {
GroupList.incGroupCount(group);
} else {
GroupList.decGroupCount(group);
}
},
error: function() {
if (add) {
OC.Notification.show(t('settings', 'Unable to add user to group {group}', {
group: group
}));
} else {
OC.Notification.show(t('settings', 'Unable to remove user from group {group}', {
group: group
}));
}
}
);
});
};
addUserToGroup = function (group) {
return handleUserGroupMembership(group, true);
};
removeUserFromGroup = function (group) {
return handleUserGroupMembership(group, false);
};
}
var addGroup = function (select, group) {
@ -473,8 +494,8 @@ var UserList = {
createText: label,
selectedFirst: true,
checked: checked,
oncheck: checkHandler,
onuncheck: checkHandler,
oncheck: addUserToGroup,
onuncheck: removeUserFromGroup,
minWidth: 100
});
},