archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-20 15:09:38 +00:00
Code Issues Projects Releases Wiki Activity

Refactored notification showing and global view data

Browse source
This commit is contained in:
Dan Brown 2019-09-19 15:12:10 +01:00
parent 60d0f96cd7
commit 2a2cc858f0
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
15 changed files with 102 additions and 58 deletions
app/Http/Controllers
UserController.php

12
app/Http/Controllers/UserController.php
View file

@ -144,7 +144,7 @@ class UserController extends Controller
*/
public function update(Request $request, $id)
{
$this->preventAccessForDemoUsers();
$this->preventAccessInDemoMode();
$this->checkPermissionOrCurrentUser('users-manage', $id);
$this->validate($request, [
@ -202,7 +202,7 @@ class UserController extends Controller
}
$user->save();
session()->flash('success', trans('settings.users_edit_success'));
$this->showSuccessNotification( trans('settings.users_edit_success'));
$redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
return redirect($redirectUrl);
@ -230,23 +230,23 @@ class UserController extends Controller
*/
public function destroy($id)
{
$this->preventAccessForDemoUsers();
$this->preventAccessInDemoMode();
$this->checkPermissionOrCurrentUser('users-manage', $id);
$user = $this->userRepo->getById($id);
if ($this->userRepo->isOnlyAdmin($user)) {
session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
$this->showErrorNotification( trans('errors.users_cannot_delete_only_admin'));
return redirect($user->getEditUrl());
}
if ($user->system_name === 'public') {
session()->flash('error', trans('errors.users_cannot_delete_guest'));
$this->showErrorNotification( trans('errors.users_cannot_delete_guest'));
return redirect($user->getEditUrl());
}
$this->userRepo->destroy($user);
session()->flash('success', trans('settings.users_delete_success'));
$this->showSuccessNotification( trans('settings.users_delete_success'));
return redirect('/settings/users');
}