ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update groups if unlocked

Browse Source
This commit is contained in:
snipe
2015-03-25 14:26:12 -07:00
parent 865c302f71
commit bbcc8aa9ac
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/UsersController.php
+16 -13
View File
@@ -305,7 +305,7 @@ class UsersController extends AdminController
// Do we want to update the user password?
if ($password) {
if (($password) && (!Config::get('app.lock_passwords'))) {
$user->password = $password;
}
@@ -320,19 +320,22 @@ class UsersController extends AdminController
$groupsToAdd = array_diff($selectedGroups, $userGroups);
$groupsToRemove = array_diff($userGroups, $selectedGroups);
// Assign the user to groups
foreach ($groupsToAdd as $groupId) {
$group = Sentry::getGroupProvider()->findById($groupId);
if (!Config::get('app.lock_passwords')) {
$user->addGroup($group);
}
// Remove the user from groups
foreach ($groupsToRemove as $groupId) {
$group = Sentry::getGroupProvider()->findById($groupId);
$user->removeGroup($group);
}
// Assign the user to groups
foreach ($groupsToAdd as $groupId) {
$group = Sentry::getGroupProvider()->findById($groupId);
$user->addGroup($group);
}
// Remove the user from groups
foreach ($groupsToRemove as $groupId) {
$group = Sentry::getGroupProvider()->findById($groupId);
$user->removeGroup($group);
}
}
// Was the user updated?
if ($user->save()) {