Bugfix/nested elements and revisions

CHANGELOG.md

@@ -12,6 +12,9 @@
 - Fixed a bug `craft\services\Entries::saveSection()` and `craft\services\Volumes::saveVolume()` weren’t respecting predefined UUID values on new models.
 - Fixed a bug where Addresses fields in element index view weren’t showing newly-created addresses. ([#15911](https://github.com/craftcms/cms/pull/15911)) 
 - Fixed a bug where disabled Money fields were showing the clear button.
+- Fixed a bug where element slideouts had a “Save” button when viewing a revision. ([#15930](https://github.com/craftcms/cms/pull/15930))
+- Fixed a bug where element edit pages had a “Revert content from this revision” button for elements that didn’t support revisions. ([#15930](https://github.com/craftcms/cms/pull/15930))
+- Fixed an error that occurred when loading a soft-deleted nested entry from a revision. ([#15930](https://github.com/craftcms/cms/pull/15930))
 
 ## 5.4.8 - 2024-10-15
 

src/controllers/ElementsController.php

@@ -438,6 +438,7 @@ public function actionEdit(?ElementInterface $element, ?int $elementId = null):
                         'visibleLayoutElements' => $form ? $form->getVisibleElements() : [],
                         'updatedTimestamp' => $element->dateUpdated?->getTimestamp(),
                         'canonicalUpdatedTimestamp' => $canonical->dateUpdated?->getTimestamp(),
+                        'isStatic' => $isRevision,
                     ]
                 )
             );
@@ -898,7 +899,7 @@ private function _additionalButtons(
         }
 
         // Revert content from this revision
-        if ($isRevision && $canSaveCanonical) {
+        if ($isRevision && $canSaveCanonical && $element->hasRevisions()) {
             $components[] = Html::beginForm() .
                 Html::actionInput('elements/revert') .
                 Html::redirectInput('{cpEditUrl}') .
@@ -2110,15 +2111,20 @@ private function _element(
 
         // Loading an existing element?
         if ($this->_draftId || $this->_revisionId) {
-            $element = $this->_elementQuery($elementType)
+            $query = $this->_elementQuery($elementType)
                 ->draftId($this->_draftId)
                 ->revisionId($this->_revisionId)
                 ->provisionalDrafts($this->_provisional)
                 ->siteId($siteId)
                 ->preferSites($preferSites)
                 ->unique()
-                ->status(null)
-                ->one();
+                ->status(null);
+
+            if ($this->_revisionId) {
+                $query->trashed(null);
+            }
+
+            $element = $query->one();
 
             if (!$element) {
                 // check for the canonical element as a fallback

src/web/assets/cp/src/js/ElementEditorSlideout.js

@@ -46,6 +46,14 @@ Craft.ElementEditorSlideout = Craft.CpScreenSlideout.extend(
             this.$container.data('elementEditorSettings')
           )
         );
+
+        // if it's supposed to be static, e.g. it's a revision,
+        // don't show the save button and change wording on the cancel one
+        if (this.elementEditor.settings.isStatic) {
+          this.$saveBtn.remove();
+          this.$cancelBtn[0].innerText = Craft.t('app', 'Close');
+        }
+
         this.elementEditor.on('beforeSubmit', () => {
           Object.keys(this.settings.saveParams).forEach((name) => {
             $('<input/>', {
@@ -187,6 +195,7 @@ Craft.ElementEditorSlideout = Craft.CpScreenSlideout.extend(
       onSaveElement: null,
       validators: [],
       expandData: [],
+      isStatic: false,
     },
   }
 );