wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18403 from owncloud/do-not-delete-group-if-empty

Browse source 
Do not delete group if empty, hide delete icon for group admin
This commit is contained in:
Morris Jobke 2015-08-19 21:07:04 +02:00
commit 08161027c4
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
settings/ajax/togglegroups.php
View file

@ -60,9 +60,6 @@ if( OC_Group::inGroup( $username, $group )) {
$error = $l->t("Unable to remove user from group %s", $group);
$success = OC_Group::removeFromGroup( $username, $group );
$usersInGroup=OC_Group::usersInGroup($group);
if(count($usersInGroup) === 0) {
OC_Group::deleteGroup($group);
}
}
else{
$success = OC_Group::addToGroup( $username, $group );

11
settings/js/users/users.js
View file

@ -470,17 +470,6 @@ var UserList = {
UserList.availableGroups.push(groupName);
}
// in case this was the last user in that group the group has to be removed
var groupElement = GroupList.getGroupLI(groupName);
var userCount = GroupList.getUserCount(groupElement);
if (response.data.action === 'remove' && userCount === 1) {
_.without(UserList.availableGroups, groupName);
GroupList.remove(groupName);
$('.groupsselect option').filterAttr('value', groupName).remove();
$('.subadminsselect option').filterAttr('value', groupName).remove();
}
}
if (response.data.message) {
OC.Notification.show(response.data.message);

2
settings/templates/users/part.grouplist.php
View file

@ -43,9 +43,11 @@
</a>
<span class="utils">
<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
<?php if($_['isAdmin']): ?>
<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
</a>
<?php endif; ?>
</span>
</li>
<?php endforeach; ?>