From 339d57f63699c906ce74282fae4fe54080b91c4f Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Thu, 22 Aug 2024 10:14:38 +0100 Subject: [PATCH] allow deleting below minEntries --- src/fields/Matrix.php | 11 +---------- src/web/assets/cp/src/js/NestedElementManager.js | 4 +--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php index f2707a4d999..bc5e4e86c19 100644 --- a/src/fields/Matrix.php +++ b/src/fields/Matrix.php @@ -590,8 +590,7 @@ public function canDeleteElement(NestedElementInterface $element, User $user): ? return false; } - // Make sure we aren't hitting the Min Entries limit - return !$this->minEntriesReached($owner); + return true; } /** @@ -602,14 +601,6 @@ public function canDeleteElementForSite(NestedElementInterface $element, User $u return false; } - private function minEntriesReached(ElementInterface $owner): bool - { - return ( - $this->minEntries && - $this->minEntries >= $this->totalEntries($owner) - ); - } - private function maxEntriesReached(ElementInterface $owner): bool { return ( diff --git a/src/web/assets/cp/src/js/NestedElementManager.js b/src/web/assets/cp/src/js/NestedElementManager.js index a2e51d34c3f..2b17553c8b8 100644 --- a/src/web/assets/cp/src/js/NestedElementManager.js +++ b/src/web/assets/cp/src/js/NestedElementManager.js @@ -285,9 +285,7 @@ Craft.NestedElementManager = Garnish.Base.extend( return true; } - const total = this.getTotalElements(); - - return total !== null && total - (num || 1) >= this.settings.minElements; + return this.getTotalElements() !== null; }, getElementIds() {