Merge pull request #18652 from craftcms/bugfix/18648-matrix-actions-and-read-only-mode

Bugfix/18648 matrix actions and read only mode

Author: brandonkelly

CHANGELOG.md

@@ -8,6 +8,8 @@
 - Fixed a bug where element search query caches weren’t getting invalidated when elements’ search keywords were indexed. ([#18275](https://github.com/craftcms/cms/issues/18275))
 - Fixed a bug where disabled sites weren’t getting loaded when running Codeception tests. ([#18638](https://github.com/craftcms/cms/issues/18638))
 - Fixed a bug where custom entry index page icons weren’t getting stored properly if the source name contained periods. ([#18631](https://github.com/craftcms/cms/issues/18631))
+- Fixed a bug where copying nested entries on a revision wasn’t working. ([#18648](https://github.com/craftcms/cms/issues/18648))
+- Fixed a bug where Matrix fields in Blocks view could have “Duplicate selected blocks” and “Delete selected blocks” field-level actions. ([#18652](https://github.com/craftcms/cms/pull/18652))
 
 ## 5.9.18 - 2026-03-26
 

src/controllers/AppController.php

@@ -825,6 +825,11 @@ public function actionRenderElements(): Response
                     ->ownerId($ownerId);
             }
 
+            // if we have revisionId, then we might need to look through soft-deleted elements too
+            if (isset($criterion['revisionId'])) {
+                $query->trashed(null);
+            }
+
             $elements = $query->all();
 
             // See if there are any provisional changes we should show

src/controllers/ElementsController.php

@@ -1729,6 +1729,17 @@ public function actionBulkDuplicate(): ?Response
                         ->only($element->safeAttributes())
                         ->all();
 
+                    // if element is a revision, we need to nullify some additional attributes
+                    if ($element->getIsRevision()) {
+                        $safeNewAttributes['revisionId'] = null;
+
+                        if ($element->dateDeleted !== null) {
+                            $safeNewAttributes['dateDeleted'] = null;
+                            $safeNewAttributes['deletedWithOwner'] = null;
+                            $safeNewAttributes['trashed'] = false;
+                        }
+                    }
+
                     try {
                         $newElement = $elementsService->duplicateElement(
                             $element,

src/fields/Matrix.php

@@ -980,12 +980,16 @@ private function blockViewActionMenuItems(): array
             $entrySelector = ' > .blocks > .matrixblock';
 
             $items[] = $this->copyAction($type, $entrySelector);
-            $items[] = $this->duplicateAction($type, $entrySelector, <<<JS
+            if (!$this->static) {
+                $items[] = $this->duplicateAction($type, $entrySelector, <<<JS
 field.data('matrix').duplicateSelectedEntries();
-JS);
-            $items[] = $this->deleteAction($type, $entrySelector, <<<JS
+JS
+                );
+                $items[] = $this->deleteAction($type, $entrySelector, <<<JS
 field.data('matrix').deleteSelectedEntries();
-JS);
+JS
+                );
+            }
         }
 
         return $items;
@@ -1003,10 +1007,12 @@ private function cardViewActionMenuItems(): array
             $items[] = $this->copyAction($type, $entrySelector);
             $items[] = $this->duplicateAction($type, $entrySelector, <<<JS
 field.children('.nested-element-cards').data('nestedElementManager').duplicateElements(getEntries());
-JS);
+JS
+            );
             $items[] = $this->deleteAction($type, $entrySelector, <<<JS
 field.children('.nested-element-cards').data('nestedElementManager').deleteElements(getEntries());
-JS);
+JS
+            );
         }
 
         return $items;

src/web/assets/cp/dist/cp.js

@@ -2320,6 +2320,7 @@ Craft.CP.ElementCopyNotification = Craft.CP.Notification.extend({
             type: e.type,
             id: e.id,
             siteId: e.siteId,
+            revisionId: e.revisionId ?? null,
             instances: [
               {
                 ui: 'chip',

src/web/assets/cp/dist/cp.js.map

@@ -205,7 +205,7 @@
 
         const entryTypeIds = this.entryTypes.map((entryType) => entryType.id);
         for (const info of elementInfo) {
-          if (!entryTypeIds.includes(info.data.entryTypeId)) {
+          if (!entryTypeIds.includes(info.data?.entryTypeId)) {
             return false;
           }
         }