github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-01 22:39:13 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613

Browse Source
This commit is contained in:
Dan Brown
2017-12-29 16:25:15 +00:00
parent 0c1b1cd435 d5a2529775
commit 1aa4d0dc59
7 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BookController.php
View File

@ -46,7 +46,7 @@ class BookController extends Controller
'books' => $books,
'recents' => $recents,
'popular' => $popular,
'new' => $new,
'new' => $new,
'booksViewType' => $booksViewType
]);
}

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

@ -249,4 +249,27 @@ class UserController extends Controller
'assetCounts' => $assetCounts
]);
}
public function switchBookView($id, Request $request) {
$this->checkPermissionOr('users-manage', function () use ($id) {
return $this->currentUser->id == $id;
});
$viewType = $request->get('book_view_type');
if (!in_array($viewType, ['grid', 'list'])) {
$viewType = 'list';
}
$user = $this->user->findOrFail($id);
setting()->putUser($user, 'books_view_type', $viewType);
$previousUrl = url()->previous();
if (empty($previousUrl)) {
// if no previous URL, redirect to settings
return redirect("/settings/users/$id");
} else {
// redirect to the previous page.
return redirect($previousUrl);
}
}
}