From: Dan Brown <redacted>
Date: Sun, 21 Mar 2021 21:52:39 +0000 (+0000)
Subject: Merge branch 'feature/sort-shelf-books' of git://github.com/guillaumehanotel/BookStac... 
X-Git-Tag: v21.04~1^2~9
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/ab4c5a55b8305a125ad8610a55361d976541ec60?ds=inline;hp=-c

Merge branch 'feature/sort-shelf-books' of git://github.com/guillaumehanotel/BookStack into guillaumehanotel-feature/sort-shelf-books
---

ab4c5a55b8305a125ad8610a55361d976541ec60
diff --combined app/Http/Controllers/BookshelfController.php
index 8574c1b48,6c090a26d..14bc9d94e
--- a/app/Http/Controllers/BookshelfController.php
+++ b/app/Http/Controllers/BookshelfController.php
@@@ -32,7 -32,7 +32,7 @@@ class BookshelfController extends Contr
       */
      public function index()
      {
 -        $view = setting()->getForCurrentUser('bookshelves_view_type', config('app.views.bookshelves', 'grid'));
 +        $view = setting()->getForCurrentUser('bookshelves_view_type');
          $sort = setting()->getForCurrentUser('bookshelves_sort', 'name');
          $order = setting()->getForCurrentUser('bookshelves_sort_order', 'asc');
          $sortOptions = [
@@@ -101,15 -101,27 +101,27 @@@
          $shelf = $this->bookshelfRepo->getBySlug($slug);
          $this->checkOwnablePermission('book-view', $shelf);
  
+         $sort = setting()->getForCurrentUser('shelf_books_sort', 'name');
+         $order = setting()->getForCurrentUser('shelf_books_sort_order', 'asc');
+ 
+         $visibleShelfBooks = $shelf->visibleBooks()->get();
+         $sortedVisibleShelfBooks = $visibleShelfBooks
+             ->sortBy($sort, SORT_REGULAR, $order === 'desc')
+             ->values()
+             ->all();
+ 
          Views::add($shelf);
          $this->entityContextManager->setShelfContext($shelf->id);
 -        $view = setting()->getForCurrentUser('bookshelf_view_type', config('app.views.books'));
 +        $view = setting()->getForCurrentUser('bookshelf_view_type');
  
          $this->setPageTitle($shelf->getShortName());
          return view('shelves.show', [
              'shelf' => $shelf,
+             'sortedVisibleShelfBooks' => $sortedVisibleShelfBooks,
              'view' => $view,
-             'activity' => Activity::entityActivity($shelf, 20, 1)
+             'activity' => Activity::entityActivity($shelf, 20, 1),
+             'order' => $order,
+             'sort' => $sort
          ]);
      }
  
diff --combined app/Http/Controllers/UserController.php
index d797552f1,f3ee03156..59c6d6edf
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@@ -5,13 -5,10 +5,13 @@@ use BookStack\Auth\Access\SocialAuthSer
  use BookStack\Auth\Access\UserInviteService;
  use BookStack\Auth\User;
  use BookStack\Auth\UserRepo;
 +use BookStack\Exceptions\ImageUploadException;
  use BookStack\Exceptions\UserUpdateException;
  use BookStack\Uploads\ImageRepo;
 +use Exception;
  use Illuminate\Http\Request;
  use Illuminate\Support\Str;
 +use Illuminate\Validation\ValidationException;
  
  class UserController extends Controller
  {
@@@ -64,7 -61,7 +64,7 @@@
      /**
       * Store a newly created user in storage.
       * @throws UserUpdateException
 -     * @throws \Illuminate\Validation\ValidationException
 +     * @throws ValidationException
       */
      public function store(Request $request)
      {
@@@ -93,7 -90,6 +93,7 @@@
              $user->external_auth_id = $request->get('external_auth_id');
          }
  
 +        $user->refreshSlug();
          $user->save();
  
          if ($sendInvite) {
@@@ -136,8 -132,8 +136,8 @@@
      /**
       * Update the specified user in storage.
       * @throws UserUpdateException
 -     * @throws \BookStack\Exceptions\ImageUploadException
 -     * @throws \Illuminate\Validation\ValidationException
 +     * @throws ImageUploadException
 +     * @throws ValidationException
       */
      public function update(Request $request, int $id)
      {
@@@ -161,11 -157,6 +161,11 @@@
              $user->email = $request->get('email');
          }
  
 +        // Refresh the slug if the user's name has changed
 +        if ($user->isDirty('name')) {
 +            $user->refreshSlug();
 +        }
 +
          // Role updates
          if (userCan('users-manage') && $request->filled('roles')) {
              $roles = $request->get('roles');
@@@ -225,7 -216,7 +225,7 @@@
  
      /**
       * Remove the specified user from storage.
 -     * @throws \Exception
 +     * @throws Exception
       */
      public function destroy(Request $request, int $id)
      {
@@@ -252,6 -243,25 +252,6 @@@
          return redirect('/settings/users');
      }
  
 -    /**
 -     * Show the user profile page
 -     */
 -    public function showProfilePage($id)
 -    {
 -        $user = $this->userRepo->getById($id);
 -
 -        $userActivity = $this->userRepo->getActivity($user);
 -        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5);
 -        $assetCounts = $this->userRepo->getAssetCounts($user);
 -
 -        return view('users.profile', [
 -            'user' => $user,
 -            'activity' => $userActivity,
 -            'recentlyCreated' => $recentlyCreated,
 -            'assetCounts' => $assetCounts
 -        ]);
 -    }
 -
      /**
       * Update the user's preferred book-list display setting.
       */
@@@ -300,7 -310,7 +300,7 @@@
       */
      public function changeSort(Request $request, string $id, string $type)
      {
-         $validSortTypes = ['books', 'bookshelves'];
+         $validSortTypes = ['books', 'bookshelves', 'shelf_books'];
          if (!in_array($type, $validSortTypes)) {
              return redirect()->back(500);
          }