Added the ability to set key-value pairs as $sortable

It allows one to target, say, the “name” column in HTML, which actually corresponds to the joined column “parties.official_name”: `’name’ => ‘parties.official_name’`
brynj-digital · Aug 5, 2015 · 452034f · 452034f
1 parent a0083dc
commit 452034f
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Traits/Sortable.php b/src/Traits/Sortable.php
@@ -23,7 +23,7 @@ public function scopeSorted($query, $field = false, $direction = false)
         }
 
         // If the field requested isn't known to be sortable by our model, fail silently.
-        if(!in_array($field, (array) $this->sortable))
+        if(!in_array($field, (array) $this->sortable) && !isset($this->sortable[$field]))
         {
             return $query;
         }
@@ -34,15 +34,20 @@ public function scopeSorted($query, $field = false, $direction = false)
             $direction = config('gbrock-tables.default_direction');
         }
 
-        if(in_array($field, $this->sortable))
+        if(isset($this->sortable[$field]))
+        {
+            // Set via key
+            $sortField = $this->sortable[$field];
+        }
+        elseif(in_array($field, $this->sortable))
         {
             // Does the passed field contain a period character?
             $sortField = strpos($field, '.') === FALSE ? $this->getTable() . '.' . $field : $field;
-
-            // At this point, all should be well, continue.
-            return $query
-                ->orderBy($sortField, $direction);
         }
+
+        // At this point, all should be well, continue.
+        return $query
+            ->orderBy($sortField, $direction);
     }
 
     public function getSortable()