v2 first commit

app/Models/Auth/Permission.php

@@ -2,19 +2,14 @@
 
 namespace App\Models\Auth;
 
-use EloquentFilter\Filterable;
-use Laratrust\LaratrustPermission;
+use Laratrust\Models\LaratrustPermission;
 use Laratrust\Traits\LaratrustPermissionTrait;
 use Kyslik\ColumnSortable\Sortable;
-use Request;
-use Route;
+use Lorisleiva\LaravelSearchString\Concerns\SearchString;
 
 class Permission extends LaratrustPermission
 {
-    use LaratrustPermissionTrait;
-    use Filterable;
-    use Sortable;
-
+    use LaratrustPermissionTrait, SearchString, Sortable;
 
     protected $table = 'permissions';
 
@@ -25,31 +20,6 @@ class Permission extends LaratrustPermission
      */
     protected $fillable = ['name', 'display_name', 'description'];
 
-    /**
-     * Define the filter provider globally.
-     *
-     * @return ModelFilter
-     */
-    public function modelFilter()
-    {
-        // Check if is api or web
-        if (Request::is('api/*')) {
-            $arr = array_reverse(explode('\\', explode('@', app()['api.router']->currentRouteAction())[0]));
-            $folder = $arr[1];
-            $file = $arr[0];
-        } else {
-            list($folder, $file) = explode('/', Route::current()->uri());
-        }
-
-        if (empty($folder) || empty($file)) {
-            return $this->provideFilter();
-        }
-
-        $class = '\App\Filters\\' . ucfirst($folder) .'\\' . ucfirst($file);
-
-        return $this->provideFilter($class);
-    }
-
     /**
      * Scope to get all rows filtered, sorted and paginated.
      *
@@ -62,9 +32,9 @@ class Permission extends LaratrustPermission
     {
         $request = request();
 
-        $input = $request->input();
-        $limit = $request->get('limit', setting('general.list_limit', '25'));
+        $search = $request->get('search');
+        $limit = $request->get('limit', setting('default.list_limit', '25'));
 
-        return $query->filter($input)->sortable($sort)->paginate($limit);
+        return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
     }
 }