Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/nested elements disallow actions in revisions #15879

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/controllers/ElementIndexesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions src/elements/NestedElementManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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']) {
Expand Down
5 changes: 5 additions & 0 deletions src/helpers/Cp.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/web/assets/cp/src/js/BaseElementIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -1567,6 +1567,7 @@ Craft.BaseElementIndex = Garnish.Base.extend(
params.viewState.showHeaderColumn = this.settings.showHeaderColumn;
params.viewState.inlineEditing = this.inlineEditing;
params.viewState.nestedInputNamespace = this.nestedInputNamespace;
params.viewState.static = this.settings.static;

// override viewState.mode in case it's different from what's stored
params.viewState.mode = this.viewMode;
Expand Down Expand Up @@ -3762,6 +3763,7 @@ Craft.BaseElementIndex = Garnish.Base.extend(
referenceElementSiteId: null,
allowedViewModes: null,
showHeaderColumn: true,
static: false,
criteria: null,
batchSize: 100,
disabledElementIds: [],
Expand Down
38 changes: 20 additions & 18 deletions src/web/assets/cp/src/js/NestedElementManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -419,25 +419,27 @@ Craft.NestedElementManager = Garnish.Base.extend(
}

const $actionMenuBtn = $element.find('.action-btn');
const disclosureMenu = $actionMenuBtn
.disclosureMenu()
.data('disclosureMenu');

if (Garnish.hasAttr($element, 'data-deletable')) {
const ul = disclosureMenu.addGroup();
disclosureMenu.addItem(
{
icon: 'trash',
label: this.settings.deleteLabel || Craft.t('app', 'Delete'),
destructive: true,
onActivate: () => {
if (confirm(this.settings.deleteConfirmationMessage)) {
this.deleteElement($element);
}
if ($actionMenuBtn.length > 0) {
const disclosureMenu = $actionMenuBtn
.disclosureMenu()
.data('disclosureMenu');

if (Garnish.hasAttr($element, 'data-deletable')) {
const ul = disclosureMenu.addGroup();
disclosureMenu.addItem(
{
icon: 'trash',
label: this.settings.deleteLabel || Craft.t('app', 'Delete'),
destructive: true,
onActivate: () => {
if (confirm(this.settings.deleteConfirmationMessage)) {
this.deleteElement($element);
}
},
},
},
ul
);
ul
);
}
}
},

Expand Down