Mail: Removed custom symfony/mailer fork

[bookstack] / app / Sorting / BookSortController.php

diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index feed5db4fde0694086d7c2a90b6ae61e21c96aa3..d70d0e6565acc33f5113fdb352cc6c76252fd997 100644 (file)
--- a/app/Sorting/BookSortController.php
+++ b/app/Sorting/BookSortController.php
@@ -7,6 +7,7 @@ use BookStack\Entities\Queries\BookQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;

+use BookStack\Util\DatabaseTransaction;

 use Illuminate\Http\Request;
 
 class BookSortController extends Controller
 use Illuminate\Http\Request;
 
 class BookSortController extends Controller


@@ -44,24 +45,42 @@ class BookSortController extends Controller
     }
 
     /**
     }
 
     /**

-     * Sorts a book using a given mapping array.
+     * Update the sort options of a book, setting the auto-sort and/or updating
+     * child order via mapping.

      */
     public function update(Request $request, BookSorter $sorter, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);
      */
     public function update(Request $request, BookSorter $sorter, string $bookSlug)
     {
         $book = $this->queries->findVisibleBySlugOrFail($bookSlug);
         $this->checkOwnablePermission('book-update', $book);

+        $loggedActivityForBook = false;

 
 

-        // Return if no map sent
-        if (!$request->filled('sort-tree')) {
-            return redirect($book->getUrl());
-        }
+        // Sort via map
+        if ($request->filled('sort-tree')) {
+            (new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) {
+                $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
+                $booksInvolved = $sorter->sortUsingMap($sortMap);

 
 

-        $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
-        $booksInvolved = $sorter->sortUsingMap($sortMap);
+                // Add activity for involved books.
+                foreach ($booksInvolved as $bookInvolved) {
+                    Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+                    if ($bookInvolved->id === $book->id) {
+                        $loggedActivityForBook = true;
+                    }
+                }
+            }))->run();
+        }

 
 

-        // Rebuild permissions and add activity for involved books.
-        foreach ($booksInvolved as $bookInvolved) {
-            Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+        if ($request->filled('auto-sort')) {
+            $sortSetId = intval($request->get('auto-sort')) ?: null;
+            if ($sortSetId && SortRule::query()->find($sortSetId) === null) {
+                $sortSetId = null;
+            }
+            $book->sort_rule_id = $sortSetId;
+            $book->save();
+            $sorter->runBookAutoSort($book);
+            if (!$loggedActivityForBook) {
+                Activity::add(ActivityType::BOOK_SORT, $book);
+            }

         }
 
         return redirect($book->getUrl());
         }
 
         return redirect($book->getUrl());