From f4890eec0c6e3ea4966c9e5cfbf61e4874507cfe Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 5 Aug 2015 19:53:05 +1000
Subject: [PATCH] Add better support for pivot relations in lists

---
 modules/backend/widgets/Lists.php | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 8bb979026..cc885e953 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -453,7 +453,9 @@ class Lists extends WidgetBase
          */
         if ($sortColumn = $this->getSortColumn()) {
             if (($column = array_get($this->allColumns, $sortColumn)) && $column->valueFrom) {
-                $sortColumn = $column->valueFrom;
+                $sortColumn = $this->isColumnPivot($column)
+                    ? 'pivot_' . $column->valueFrom
+                    : $column->valueFrom;
             }
 
             $query->orderBy($sortColumn, $this->sortDirection);
@@ -687,7 +689,13 @@ class Lists extends WidgetBase
             $label = studly_case($name);
         }
 
-        if (strpos($name, '[') !== false && strpos($name, ']') !== false) {
+        if (starts_with($name, 'pivot[') && strpos($name, ']') !== false) {
+            $_name = HtmlHelper::nameToArray($name);
+            $config['relation'] = array_shift($_name);
+            $config['valueFrom'] = array_shift($_name);
+            $config['searchable'] = false;
+        }
+        elseif (strpos($name, '[') !== false && strpos($name, ']') !== false) {
             $config['valueFrom'] = $name;
             $config['sortable'] = false;
             $config['searchable'] = false;
@@ -758,7 +766,7 @@ class Lists extends WidgetBase
             elseif ($this->isColumnRelated($column, true)) {
                 $value = implode(', ', $record->{$columnName}->lists($column->valueFrom));
             }
-            elseif ($this->isColumnRelated($column)) {
+            elseif ($this->isColumnRelated($column) || $this->isColumnPivot($column)) {
                 $value = $record->{$columnName}->{$column->valueFrom};
             }
             else {
@@ -1244,7 +1252,7 @@ class Lists extends WidgetBase
      */
     protected function isColumnRelated($column, $multi = false)
     {
-        if (!isset($column->relation)) {
+        if (!isset($column->relation) || $this->isColumnPivot($column)) {
             return false;
         }
 
@@ -1271,4 +1279,18 @@ class Lists extends WidgetBase
             'hasManyThrough'
         ]);
     }
+
+    /**
+     * Checks if a column refers to a pivot model specifically.
+     * @param  ListColumn  $column List column object
+     * @return boolean
+     */
+    protected function isColumnPivot($column)
+    {
+        if (!isset($column->relation) || $column->relation != 'pivot') {
+            return false;
+        }
+
+        return true;
+    }
 }