webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Updated and added tests for new default user system

Browse Source 
Closes #138
This commit is contained in:
Dan Brown
2016-09-29 17:07:58 +01:00
parent b662670efc
commit 3b7d223b0c
11 changed files with 148 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/PageController.php
View File

@ -106,7 +106,13 @@ class PageController extends Controller
$this->checkOwnablePermission('page-create', $book);
$this->setPageTitle('Edit Page Draft');
return view('pages/edit', ['page' => $draft, 'book' => $book, 'isDraft' => true]);
$draftsEnabled = $this->signedIn;
return view('pages/edit', [
'page' => $draft,
'book' => $book,
'isDraft' => true,
'draftsEnabled' => $draftsEnabled
]);
}
/**

7
app/Http/Controllers/UserController.php
View File

@ -187,7 +187,7 @@ class UserController extends Controller
/**
* Show the user delete page.
* @param $id
* @param int $id
* @return \Illuminate\View\View
*/
public function delete($id)
@ -220,6 +220,11 @@ class UserController extends Controller
return redirect($user->getEditUrl());
}
if ($user->system_name === 'public') {
session()->flash('error', 'You cannot delete the guest user');
return redirect($user->getEditUrl());
}
$this->userRepo->destroy($user);
session()->flash('success', 'User successfully removed');