diff --git a/CHANGELOG.md b/CHANGELOG.md index 37854284f08..4dc7fc73f89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed a deprecation error. ([#15873](https://github.com/craftcms/cms/issues/15873)) - Fixed a bug where element sources weren’t keyboard-selectable. ([#15876](https://github.com/craftcms/cms/issues/15876)) - Fixed a bug where Craft wasn’t auto-detecting interactive terminals on Windows. +- Fixed a bug where element actions were allowed on nested entries when viewing a revision. ([#15879](https://github.com/craftcms/cms/pull/15879)) ## 5.4.7.1 - 2024-10-09 diff --git a/src/controllers/ElementIndexesController.php b/src/controllers/ElementIndexesController.php index 85ec0a07e13..1f9d09ecd84 100644 --- a/src/controllers/ElementIndexesController.php +++ b/src/controllers/ElementIndexesController.php @@ -838,7 +838,7 @@ protected function elementResponseData(bool $includeContainer, bool $includeActi // Get the action head/foot HTML before any more is added to it from the element HTML if ($includeActions) { - $responseData['actions'] = $this->actionData(); + $responseData['actions'] = $this->viewState['static'] === true ? [] : $this->actionData(); $responseData['actionsHeadHtml'] = $view->getHeadHtml(); $responseData['actionsBodyHtml'] = $view->getBodyHtml(); $responseData['exporters'] = $this->exporterData(); diff --git a/src/elements/NestedElementManager.php b/src/elements/NestedElementManager.php index 1540b50088f..06625b37166 100644 --- a/src/elements/NestedElementManager.php +++ b/src/elements/NestedElementManager.php @@ -468,6 +468,7 @@ public function getIndexHtml(?ElementInterface $owner, array $config = []): stri 'prevalidate' => false, 'pageSize' => 50, 'storageKey' => null, + 'static' => $owner->getIsRevision(), ]; if ($config['storageKey'] === null) { @@ -514,6 +515,7 @@ function(string $id, array $config, string $attribute, array &$settings) use ($o 'actions' => [], 'canHaveDrafts' => $elementType::hasDrafts(), 'storageKey' => $config['storageKey'], + 'static' => $config['static'], ]; if ($config['sortable']) { diff --git a/src/helpers/Cp.php b/src/helpers/Cp.php index f735294118f..d20560af5ae 100644 --- a/src/helpers/Cp.php +++ b/src/helpers/Cp.php @@ -579,6 +579,11 @@ public static function elementCardHtml(ElementInterface $element, array $config 'sortable' => false, ]; + if ($element->getIsRevision()) { + $config['showActionMenu'] = false; + $config['selectable'] = false; + } + $color = $element instanceof Colorable ? $element->getColor() : null; $classes = ['card']; diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js index 354b1933332..e7a6c777e8d 100644 --- a/src/web/assets/cp/dist/cp.js +++ b/src/web/assets/cp/dist/cp.js @@ -1,3 +1,3 @@ /*! For license information please see cp.js.LICENSE.txt */ -(function(){var __webpack_modules__={463:function(){Craft.Accordion=Garnish.Base.extend({$trigger:null,targetSelector:null,_$target:null,init:function(t){var e=this;this.$trigger=$(t),this.$trigger.data("accordion")&&(console.warn("Double-instantiating an accordion trigger on an element"),this.$trigger.data("accordion").destroy()),this.$trigger.data("accordion",this),this.targetSelector=this.$trigger.attr("aria-controls")?"#".concat(this.$trigger.attr("aria-controls")):null,this.targetSelector&&(this._$target=$(this.targetSelector)),this.addListener(this.$trigger,"click","onTriggerClick"),this.addListener(this.$trigger,"keypress",(function(t){var n=t.keyCode;n!==Garnish.SPACE_KEY&&n!==Garnish.RETURN_KEY||(t.preventDefault(),e.onTriggerClick())}))},onTriggerClick:function(){"true"===this.$trigger.attr("aria-expanded")?this.hideTarget(this._$target):this.showTarget(this._$target)},showTarget:function(t){var e=this;if(t&&t.length){this.showTarget._currentHeight=t.height(),t.removeClass("hidden"),this.$trigger.removeClass("collapsed").addClass("expanded").attr("aria-expanded","true");for(var n=0;n=this.settings.maxItems)){var e=$(t).appendTo(this.$tbody),n=e.find(".delete");this.settings.sortable&&this.sorter.addItems(e),this.$deleteBtns=this.$deleteBtns.add(n),this.addListener(n,"click","handleDeleteBtnClick"),this.totalItems++,this.updateUI()}},reorderItems:function(){var t=this;if(this.settings.sortable){for(var e=[],n=0;n=this.settings.maxItems?$(this.settings.newItemBtnSelector).addClass("hidden"):$(this.settings.newItemBtnSelector).removeClass("hidden"))}},{defaults:{tableSelector:null,noItemsSelector:null,newItemBtnSelector:null,idAttribute:"data-id",nameAttribute:"data-name",sortable:!1,allowDeleteAll:!0,minItems:0,maxItems:null,reorderAction:null,deleteAction:null,reorderSuccessMessage:Craft.t("app","New order saved."),reorderFailMessage:Craft.t("app","Couldn’t save new order."),confirmDeleteMessage:Craft.t("app","Are you sure you want to delete “{name}”?"),deleteSuccessMessage:Craft.t("app","“{name}” deleted."),deleteFailMessage:Craft.t("app","Couldn’t delete “{name}”."),onReorderItems:$.noop,onDeleteItem:$.noop}})},6872:function(){Craft.AssetImageEditor=Garnish.Modal.extend({$body:null,$footer:null,$imageTools:null,$buttons:null,$cancelBtn:null,$replaceBtn:null,$saveBtn:null,$focalPointBtn:null,$editorContainer:null,$straighten:null,$croppingCanvas:null,$spinner:null,$constraintContainer:null,$constraintRadioInputs:null,$customConstraints:null,canvas:null,image:null,viewport:null,focalPoint:null,grid:null,croppingCanvas:null,clipper:null,croppingRectangle:null,cropperHandles:null,cropperGrid:null,croppingShade:null,imageStraightenAngle:0,viewportRotation:0,originalWidth:0,originalHeight:0,imageVerticeCoords:null,zoomRatio:1,animationInProgress:!1,currentView:"",assetId:null,cacheBust:null,draggingCropper:!1,scalingCropper:!1,draggingFocal:!1,previousMouseX:0,previousMouseY:0,shiftKeyHeld:!1,editorHeight:0,editorWidth:0,cropperState:!1,scaleFactor:1,flipData:{},focalPointState:!1,maxImageSize:null,lastLoadedDimensions:null,imageIsLoading:!1,mouseMoveEvent:null,croppingConstraint:!1,constraintOrientation:"landscape",showingCustomConstraint:!1,saving:!1,renderImage:null,renderCropper:null,_queue:null,init:function(t,e){var n=this;this._queue=new Craft.Queue,this.cacheBust=Date.now(),this.setSettings(e,Craft.AssetImageEditor.defaults),null===this.settings.allowDegreeFractions&&(this.settings.allowDegreeFractions=Craft.isImagick),Garnish.prefersReducedMotion()&&(this.settings.animationDuration=1),this.assetId=t,this.flipData={x:0,y:0},this.$container=$('').appendTo(Garnish.$bod),this.$body=$('
').appendTo(this.$container),this.$footer=$('