DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #2894 - set whether or not the user was originally a superuser

Browse source
This commit is contained in:
snipe 2016-11-11 19:48:39 -08:00
parent 9db28cf6d6
commit 7667fca691
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/UsersController.php
View file

@ -310,13 +310,18 @@ class UsersController extends Controller
} }
try { try {
// Get the user information
$user = User::find($id); $user = User::find($id);
// Figure out of this user was an admin before this edit // Figure out of this user was an admin before this edit
$orig_permissions_array = $user->decodePermissions(); $orig_permissions_array = $user->decodePermissions();
if (array_key_exists('superuser', $orig_permissions_array)) {
$orig_superuser = $orig_permissions_array['superuser']; if (is_array($orig_permissions_array)) {
if (array_key_exists('superuser', $orig_permissions_array)) {
$orig_superuser = $orig_permissions_array['superuser'];
} else {
$orig_superuser = '0';
}
} else { } else {
$orig_superuser = '0'; $orig_superuser = '0';
} }
@ -325,11 +330,9 @@ class UsersController extends Controller
if (!Company::isCurrentUserHasAccess($user)) { if (!Company::isCurrentUserHasAccess($user)) {
return redirect()->route('users')->with('error', trans('general.insufficient_permissions')); return redirect()->route('users')->with('error', trans('general.insufficient_permissions'));
} }
} catch (UserNotFoundException $e) { } catch (UserNotFoundException $e) {
// Prepare the error message
$error = trans('admin/users/message.user_not_found', compact('id')); $error = trans('admin/users/message.user_not_found', compact('id'));
// Redirect to the user management page
return redirect()->route('users')->with('error', $error); return redirect()->route('users')->with('error', $error);
} }