Merge pull request #1355 from craftcms/bugfix/1354-relation-field-lim…

…it-adjustment use maxRelations, not limit for the relational fields
craftcms · Jul 25, 2023 · 6cb8d6d · 6cb8d6d
2 parents 5b7ccb2 + 00ad427
commit 6cb8d6d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/src/fields/Assets.php b/src/fields/Assets.php
@@ -77,7 +77,7 @@ public function parseField(): mixed
 
         $settings = Hash::get($this->field, 'settings');
         $folders = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $upload = Hash::get($this->fieldInfo, 'options.upload');

diff --git a/src/fields/CalendarEvents.php b/src/fields/CalendarEvents.php
@@ -69,7 +69,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $match = Hash::get($this->fieldInfo, 'options.match', 'title');

diff --git a/src/fields/Categories.php b/src/fields/Categories.php
@@ -76,7 +76,13 @@ public function parseField(): mixed
         }
 
         $source = Hash::get($this->field, 'settings.source');
-        $branchLimit = Hash::get($this->field, 'settings.branchLimit');
+        $maintainHierarchy = Hash::get($this->field, 'settings.maintainHierarchy');
+        if ($maintainHierarchy) {
+            $limit = Hash::get($this->field, 'settings.branchLimit');
+        } else {
+            $limit = Hash::get($this->field, 'settings.maxRelations');
+        }
+
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $create = Hash::get($this->fieldInfo, 'options.create');
@@ -135,7 +141,7 @@ public function parseField(): mixed
 
             $criteria['status'] = null;
             $criteria['groupId'] = $groupId;
-            $criteria['limit'] = $branchLimit;
+            $criteria['limit'] = $limit;
             $criteria['where'] = ['=', $columnName, $dataValue];
 
             Craft::configure($query, $criteria);
@@ -157,8 +163,8 @@ public function parseField(): mixed
         }
 
         // Check for field limit - only return the specified amount
-        if ($foundElements && $branchLimit) {
-            $foundElements = array_chunk($foundElements, $branchLimit)[0];
+        if ($foundElements && $limit) {
+            $foundElements = array_chunk($foundElements, $limit)[0];
         }
 
         // Check for any sub-fields for the element

diff --git a/src/fields/CommerceProducts.php b/src/fields/CommerceProducts.php
@@ -74,7 +74,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $node = Hash::get($this->fieldInfo, 'node');

diff --git a/src/fields/CommerceVariants.php b/src/fields/CommerceVariants.php
@@ -73,7 +73,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $node = Hash::get($this->fieldInfo, 'node');

diff --git a/src/fields/DigitalProducts.php b/src/fields/DigitalProducts.php
@@ -74,7 +74,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $node = Hash::get($this->fieldInfo, 'node');

diff --git a/src/fields/Entries.php b/src/fields/Entries.php
@@ -79,7 +79,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
         $feedSiteId = Hash::get($this->feed, 'siteId');
         $create = Hash::get($this->fieldInfo, 'options.create');

diff --git a/src/fields/Users.php b/src/fields/Users.php
@@ -77,7 +77,7 @@ public function parseField(): mixed
         }
 
         $sources = Hash::get($this->field, 'settings.sources');
-        $limit = Hash::get($this->field, 'settings.limit');
+        $limit = Hash::get($this->field, 'settings.maxRelations');
         $match = Hash::get($this->fieldInfo, 'options.match', 'email');
         $create = Hash::get($this->fieldInfo, 'options.create');
         $fields = Hash::get($this->fieldInfo, 'fields');