Patch to address Twill bug in Relation column [WEB-2982]

See area17/twill#2720
art-institute-of-chicago · Feb 6, 2025 · 7b29f85 · 7b29f85
1 parent c48cbaa
commit 7b29f85
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -19,20 +19,24 @@
             "package": {
                 "type": "metapackage",
                 "name": "vendor/package-patches",
-                "version": "1.5.0",
+                "version": "1.6.0",
                 "require": {
                     "netresearch/composer-patches-plugin": "~1.2"
                 },
                 "extra": {
                     "patches": {
                         "area17/twill": [
                             {
-                                "title": "WEB-2103: Get repository model of API models",
+                                "title": "WEB-2301: Get repository model of API models",
                                 "url": "patches/WEB-2301---get-repository-of-API-models.diff"
                             },
                             {
                                 "title": "WEB-2678: Backport Node 10 syntax",
                                 "url": "patches/WEB-2678---backport-node-10-syntax.diff"
+                            },
+                            {
+                                "title": "WEB-2982: Fix Relation column",
+                                "url": "patches/WEB-2982---fix-relation-column.diff"
                             }
                         ]
                     }

diff --git a/composer.lock b/composer.lock
diff --git a/patches/WEB-2982---fix-relation-column.diff b/patches/WEB-2982---fix-relation-column.diff
@@ -0,0 +1,24 @@
+diff --git a/src/Services/Listings/Columns/Relation.php b/src/Services/Listings/Columns/Relation.php
+index 9c6c05ec..6aa2fdd2 100644
+--- a/src/Services/Listings/Columns/Relation.php
++++ b/src/Services/Listings/Columns/Relation.php
+@@ -5,6 +5,7 @@ namespace A17\Twill\Services\Listings\Columns;
+ use A17\Twill\Exceptions\ColumnMissingPropertyException;
+ use A17\Twill\Models\Contracts\TwillModelContract;
+ use A17\Twill\Services\Listings\TableColumn;
++use Illuminate\Support\Collection;
+ use Illuminate\Support\Str;
+
+ class Relation extends TableColumn
+@@ -44,9 +45,9 @@ class Relation extends TableColumn
+             throw new ColumnMissingPropertyException('Relation column missing relation value: ' . $this->field);
+         }
+
+-        /** @var \Illuminate\Database\Eloquent\Collection $relation */
+         $model->loadMissing($this->relation);
+-        $relation = collect($model->getRelation($this->relation));
++        /** @var \Illuminate\Database\Eloquent\Collection $relation */
++        $relation = Collection::wrap($model->getRelation($this->relation));
+
+         return $relation->pluck($this->field)->join(', ');
+     }