Fix error after first change to entry

spicywebau · May 10, 2024 · 32f82fa · 32f82fa
1 parent 165eea1
commit 32f82fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - Fixed a bug where swapping the positions of new Neo blocks could cause a mixup of field layout elements and content loss
+- Fixed an error that could occur when updating visible field layout elements after the first change to an entry
 
 ## 4.1.2 - 2024-04-09
 

diff --git a/src/controllers/Input.php b/src/controllers/Input.php
@@ -197,7 +197,7 @@ public function actionUpdateVisibleElements(): Response
         $blocksData = $request->getRequiredBodyParam('blocks');
         $fieldId = $request->getRequiredBodyParam('fieldId');
         $ownerCanonicalId = $request->getRequiredBodyParam('ownerCanonicalId');
-        $ownerDraftId = $request->getRequiredBodyParam('ownerDraftId');
+        $ownerDraftId = $request->getBodyParam('ownerDraftId');
         $isProvisionalDraft = $request->getRequiredBodyParam('isProvisionalDraft');
         $siteId = $request->getRequiredBodyParam('siteId');
         $sortOrder = $request->getRequiredBodyParam('sortOrder');
@@ -207,8 +207,8 @@ public function actionUpdateVisibleElements(): Response
         $canonicalOwner = $elementsService->getElementById($ownerCanonicalId, null, $siteId);
         $draftsQueryMethod = $isProvisionalDraft ? 'provisionalDrafts' : 'drafts';
 
-        // Get the blocks belonging to the current draft
-        $draft = $canonicalOwner::find()
+        // Get the blocks belonging to the current draft, or just use the canonical owner if no draft ID provided
+        $draft = $ownerDraftId === null ? $canonicalOwner : $canonicalOwner::find()
             ->{$draftsQueryMethod}()
             ->draftId($ownerDraftId)
             ->siteId($siteId)