diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 5949d9c974..293afe9e6f 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -268,15 +268,15 @@ class UsersController extends Controller { $users = []; if ($this->isAdmin) { - if($gid !== '' && $gid !== 'disabledUsers') { + if($gid !== '' && $gid !== '_disabledUsers') { $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); } else { $batch = $this->userManager->search($pattern, $limit, $offset); } foreach ($batch as $user) { - if( ($gid !== 'disabledUsers' && $user->isEnabled()) || - ($gid === 'disabledUsers' && !$user->isEnabled()) + if( ($gid !== '_disabledUsers' && $user->isEnabled()) || + ($gid === '_disabledUsers' && !$user->isEnabled()) ) { $users[] = $this->formatUserForIndex($user); } @@ -292,7 +292,7 @@ class UsersController extends Controller { $subAdminOfGroups = $gids; // Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group - if($gid !== '' && $gid !== 'disabledUsers' && !in_array($gid, $subAdminOfGroups)) { + if($gid !== '' && $gid !== '_disabledUsers' && !in_array($gid, $subAdminOfGroups)) { $gid = ''; } @@ -317,8 +317,8 @@ class UsersController extends Controller { $this->groupManager->getUserGroupIds($user), $subAdminOfGroups )); - if( ($gid !== 'disabledUsers' && $user->isEnabled()) || - ($gid === 'disabledUsers' && !$user->isEnabled()) + if( ($gid !== '_disabledUsers' && $user->isEnabled()) || + ($gid === '_disabledUsers' && !$user->isEnabled()) ) { $users[] = $this->formatUserForIndex($user, $userGroups); } diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js index b54f26b4cc..16621441a6 100644 --- a/settings/js/users/groups.js +++ b/settings/js/users/groups.js @@ -211,9 +211,9 @@ GroupList = { showDisabledUsers: function () { UserList.empty(); - UserList.update('disabledUsers'); + UserList.update('_disabledUsers'); $userGroupList.find('li').removeClass('active'); - GroupList.getGroupLI('disabledUsers').addClass('active'); + GroupList.getGroupLI('_disabledUsers').addClass('active'); }, showGroup: function (gid) { diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 552d28ad50..117c61b7dc 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -52,7 +52,7 @@ var UserList = { * } */ add: function (user) { - if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== 'disabledUsers' && _.indexOf(user.groups, this.currentGid) < 0) { + if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== '_disabledUsers' && _.indexOf(user.groups, this.currentGid) < 0) { return false; } @@ -936,14 +936,14 @@ $(document).ready(function () { {username: uid, enabled: setEnabled}, function (result) { if (result && result.status==='success'){ - var count = GroupList.getUserCount(GroupList.getGroupLI('disabledUsers')); + var count = GroupList.getUserCount(GroupList.getGroupLI('_disabledUsers')); $tr.remove(); if(result.data.enabled == 1) { $tr.data('userEnabled', true); - GroupList.setUserCount(GroupList.getGroupLI('disabledUsers'), count-1); + GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count-1); } else { $tr.data('userEnabled', false); - GroupList.setUserCount(GroupList.getGroupLI('disabledUsers'), count+1); + GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count+1); } } else { OC.dialogs.alert(result.data.message, t('settings', 'Unable to change status of {user}', {user: uid})); diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php index 0b953c0298..5dfd7836f6 100644 --- a/settings/templates/users/part.grouplist.php +++ b/settings/templates/users/part.grouplist.php @@ -39,7 +39,7 @@ -