System CLI: Updated to 126de5599c state

[bookstack] / app / Entities / Repos / PageRepo.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 0d9541c52e57e7a71dba4865cf62f68ffdcedd6e..1bc15392cec7b4478372b761c4179e3fa364f297 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -11,7 +11,6 @@ use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Queries\EntityQueries;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;

-use BookStack\Entities\Tools\PageEditorData;

 use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Entities\Tools\PageEditorType;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\MoveOperationException;


@@ -44,6 +43,7 @@ class PageRepo
             'owned_by'   => user()->id,
             'updated_by' => user()->id,
             'draft'      => true,
             'owned_by'   => user()->id,
             'updated_by' => user()->id,
             'draft'      => true,

+            'editor'     => PageEditorType::getSystemDefault()->value,

         ]);
 
         if ($parent instanceof Chapter) {
         ]);
 
         if ($parent instanceof Chapter) {


@@ -78,7 +78,8 @@ class PageRepo
         $this->updateTemplateStatusAndContentFromInput($draft, $input);
         $this->baseRepo->update($draft, $input);
 
         $this->updateTemplateStatusAndContentFromInput($draft, $input);
         $this->baseRepo->update($draft, $input);
 

-        $this->revisionRepo->storeNewForPage($draft, trans('entities.pages_initial_revision'));
+        $summary = trim($input['summary'] ?? '') ?: trans('entities.pages_initial_revision');
+        $this->revisionRepo->storeNewForPage($draft, $summary);

         $draft->refresh();
 
         Activity::add(ActivityType::PAGE_CREATE, $draft);
         $draft->refresh();
 
         Activity::add(ActivityType::PAGE_CREATE, $draft);


@@ -145,8 +146,10 @@ class PageRepo
             $pageContent->setNewHTML($input['html'], user());
         }
 
             $pageContent->setNewHTML($input['html'], user());
         }
 

-        if ($newEditor !== $currentEditor && userCan('editor-change')) {
+        if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {

             $page->editor = $newEditor->value;
             $page->editor = $newEditor->value;

+        } elseif (empty($page->editor)) {
+            $page->editor = $defaultEditor->value;

         }
     }
 
         }
     }