Skip to content
Open
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
26 changes: 24 additions & 2 deletions src/controllers/DeleteElementsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ public function actionDelete(): Response
$deleteOwnership = [];
$elementsService = Craft::$app->getElements();

$elementsToDelete = 0;
$failureCount = 0;
foreach ($this->elements as $element) {
if (
$element instanceof NestedElementInterface &&
Expand All @@ -197,17 +199,37 @@ public function actionDelete(): Response
continue;
}

$elementsService->deleteElement($element, $this->hardDelete);
$elementsToDelete++;
$success = $elementsService->deleteElement($element, $this->hardDelete);
if (!$success) {
$failureCount++;
}
}

foreach ($deleteOwnership as $ownerId => $elementIds) {
// we're assuming this succeeds
Db::delete(Table::ELEMENTS_OWNERS, [
'elementId' => $elementIds,
'ownerId' => $ownerId,
]);
}

return $this->asJson([]);
$showAsFailure = false;
if ($failureCount !== 0 && $failureCount === $elementsToDelete) {
$message = Craft::t('app', 'Couldn’t delete {type}.', [
'type' => $elementsToDelete == 1 ? $this->elementType::lowerDisplayName() : $this->elementType::pluralLowerDisplayName(),
]);
$showAsFailure = true;
} else {
$message = Craft::t('app', '{type} deleted.', [
'type' => $elementsToDelete == 1 ? $this->elementType::displayName() : $this->elementType::pluralDisplayName(),
]);
}

return $this->asJson([
'message' => $message,
'showAsFailure' => $showAsFailure,
]);
}

private function elementOwnedByPrimaryOwner(NestedElementInterface $element): bool
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.

20 changes: 17 additions & 3 deletions src/web/assets/cp/src/js/ElementDeletionManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,16 @@ Craft.ElementDeletionManager = Garnish.Base.extend(
}

this.$submitBtn?.addClass('loading');
let data = null;
try {
await Craft.sendActionRequest('POST', 'delete-elements/delete', {
data: this.getParams(),
});
const response = await Craft.sendActionRequest(
'POST',
'delete-elements/delete',
{
data: this.getParams(),
}
);
data = response.data;
} catch (e) {
return;
} finally {
Expand All @@ -98,6 +104,14 @@ Craft.ElementDeletionManager = Garnish.Base.extend(
this.succeeded = true;
this.settings.onSuccess();
this.modal?.hide();

if (data) {
if (data.showAsFailure) {
Craft.cp.displayError(data.message);
} else {
Craft.cp.displaySuccess(data.message);
}
}
},

getConfirmationMessage: function (totalElements) {
Expand Down
Loading