enh(recently updated): show updatedBy and updated_at

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 3e57657da7199e6b5da0046b1c6f6008c50c932b..41525ac3022ac453f75c56d04b018062ea7ae38d 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -364,15 +364,17 @@ class PageController extends Controller
      */
     public function showRecentlyUpdated()
     {
      */
     public function showRecentlyUpdated()
     {

-        $pages = Page::visible()->orderBy('updated_at', 'desc')
+        $pages = Page::visible()->with('updatedBy')
+            ->orderBy('updated_at', 'desc')

             ->paginate(20)
             ->setPath(url('/pages/recently-updated'));
 
         $this->setPageTitle(trans('entities.recently_updated_pages'));
 
         return view('common.detailed-listing-paginated', [
             ->paginate(20)
             ->setPath(url('/pages/recently-updated'));
 
         $this->setPageTitle(trans('entities.recently_updated_pages'));
 
         return view('common.detailed-listing-paginated', [

-            'title'    => trans('entities.recently_updated_pages'),
-            'entities' => $pages,
+            'title'         => trans('entities.recently_updated_pages'),
+            'entities'      => $pages,
+            'showUpdatedBy' => true,

         ]);
     }
 
         ]);
     }
 


@@ -412,11 +414,9 @@ class PageController extends Controller
 
         try {
             $parent = $this->pageRepo->move($page, $entitySelection);
 
         try {
             $parent = $this->pageRepo->move($page, $entitySelection);

+        } catch (PermissionsException $exception) {
+            $this->showPermissionError();

         } catch (Exception $exception) {
         } catch (Exception $exception) {

-            if ($exception instanceof PermissionsException) {
-                $this->showPermissionError();
-            }
-

             $this->showErrorNotification(trans('errors.selected_book_chapter_not_found'));
 
             return redirect()->back();
             $this->showErrorNotification(trans('errors.selected_book_chapter_not_found'));
 
             return redirect()->back();