Update FunctionsTrait.php

Gevor701069 · web-flow · commit 5268a79313b0 · 2020-08-04T17:02:42.000+04:00
diff --git a/src/Traits/FunctionsTrait.php b/src/Traits/FunctionsTrait.php
@@ -3,6 +3,7 @@
 namespace LaraServiceModel\Traits;
 
 use LaraSupport\Facades\LaraDB;
+use Illuminate\Support\Facades\Schema;
 
 /**
  * Trait Functions
@@ -66,7 +67,7 @@ protected function setSortingOptions($options = [], $group = self::GROUP)
      */
     protected function getSortableColumns($column = null, $group = self::GROUP)
     {
-        return $this->query->getModel()->getSortable($column, $group);
+        return Schema::hasColumn($this->baseModel->getTable(), $column) && $this->query->getModel()->getSortable($column, $group);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace LaraServiceModel\Traits;`
`4`	`4`
`5`	`5`	`use LaraSupport\Facades\LaraDB;`
	`6`	`+use Illuminate\Support\Facades\Schema;`
`6`	`7`
`7`	`8`	`/**`
`8`	`9`	`* Trait Functions`
`@@ -66,7 +67,7 @@ protected function setSortingOptions($options = [], $group = self::GROUP)`
`66`	`67`	`*/`
`67`	`68`	`protected function getSortableColumns($column = null, $group = self::GROUP)`
`68`	`69`	`{`
`69`		`- return $this->query->getModel()->getSortable($column, $group);`
	`70`	`+ return Schema::hasColumn($this->baseModel->getTable(), $column) && $this->query->getModel()->getSortable($column, $group);`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`/**`