StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix inability to set user as non-admin, closes #414

Browse source
This commit is contained in:
Dane Everitt 2017-05-01 17:05:30 -04:00
parent 43df6533b0
commit 4eaf858684
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Admin/UserController.php
View file

@ -143,10 +143,13 @@ class UserController extends Controller
{
try {
$repo = new UserRepository;
$user = $repo->update($id, $request->intersect([
'email', 'password', 'name_first',
'name_last', 'username', 'root_admin',
]));
$user = $repo->update($id, array_merge(
$request->only('root_admin'),
$request->intersect([
'email', 'password', 'name_first',
'name_last', 'username',
])
));
Alert::success('User account was successfully updated.')->flash();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.users.view', $id)->withErrors(json_decode($ex->getMessage()));