Lexical: Updated URL handling, added mouse handling

[bookstack] / app / Sorting / BookSortController.php

diff --git a/app/Sorting/BookSortController.php b/app/Sorting/BookSortController.php
index 479d1972440dceca53e3c7291fa696d54c92b65b..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


@@ -55,16 +56,18 @@ class BookSortController extends Controller
 
         // Sort via map
         if ($request->filled('sort-tree')) {
 
         // Sort via map
         if ($request->filled('sort-tree')) {

-            $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
-            $booksInvolved = $sorter->sortUsingMap($sortMap);
+            (new DatabaseTransaction(function () use ($book, $request, $sorter, &$loggedActivityForBook) {
+                $sortMap = BookSortMap::fromJson($request->get('sort-tree'));
+                $booksInvolved = $sorter->sortUsingMap($sortMap);

 
 

-            // Rebuild permissions and add activity for involved books.
-            foreach ($booksInvolved as $bookInvolved) {
-                Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
-                if ($bookInvolved->id === $book->id) {
-                    $loggedActivityForBook = true;
+                // Add activity for involved books.
+                foreach ($booksInvolved as $bookInvolved) {
+                    Activity::add(ActivityType::BOOK_SORT, $bookInvolved);
+                    if ($bookInvolved->id === $book->id) {
+                        $loggedActivityForBook = true;
+                    }

                 }
                 }

-            }
+            }))->run();

         }
 
         if ($request->filled('auto-sort')) {
         }
 
         if ($request->filled('auto-sort')) {