mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 11:55:37 +00:00
Code Issues Projects Releases Wiki Activity

Ensure users editing themselves do not deactivate their account

Browse Source
This commit is contained in:
Marcus Moore
2023-04-20 21:59:55 -07:00
parent c3c22fae3c
commit 2aba8252f3
2 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Users/UsersController.php
View File

@ -210,7 +210,6 @@ class UsersController extends Controller
*/
public function update(SaveUserRequest $request, $id = null)
{
// We need to reverse the UI specific logic for our
// permissions here before we update the user.
$permissions = $request->input('permissions', []);
@ -268,7 +267,8 @@ class UsersController extends Controller
$user->city = $request->input('city', null);
$user->state = $request->input('state', null);
$user->country = $request->input('country', null);
$user->activated = $request->input('activated', 0);
// if a user is editing themselves we should always keep activated true
$user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
$user->zip = $request->input('zip', null);
$user->remote = $request->input('remote', 0);
$user->vip = $request->input('vip', 0);
@ -670,4 +670,4 @@ class UsersController extends Controller
return redirect()->back()->with('error', 'User is not activated, is LDAP synced, or does not have an email address ');
}
}
}