Merge pull request #4823 from Laravel-Backpack/use-crud-request

use request set in crud instead of global request instance

Author: tabacitu

src/app/Library/CrudPanel/CrudFilter.php

@@ -51,8 +51,8 @@ public function __construct($options, $values, $logic, $fallbackLogic)
             $this->fallbackLogic = $fallbackLogic;
         }
 
-        if (\Request::has($this->name)) {
-            $this->currentValue = \Request::input($this->name);
+        if ($this->crud()->getRequest()->has($this->name)) {
+            $this->currentValue = $this->crud()->getRequest()->input($this->name);
         }
     }
 
@@ -64,7 +64,7 @@ public function __construct($options, $values, $logic, $fallbackLogic)
      */
     public function isActive()
     {
-        if (\Request::has($this->name)) {
+        if ($this->crud()->getRequest()->has($this->name)) {
             return true;
         }
 

tests/Unit/CrudPanel/CrudPanelFiltersTest.php

@@ -2,6 +2,9 @@
 
 namespace Backpack\CRUD\Tests\Unit\CrudPanel;
 
+use Backpack\CRUD\app\Library\CrudPanel\CrudFilter;
+use Backpack\CRUD\Tests\Unit\Models\User;
+
 /**
  * @covers Backpack\CRUD\app\Library\CrudPanel\Traits\Filters
  * @covers Backpack\CRUD\app\Library\CrudPanel\CrudFilter
@@ -33,4 +36,17 @@ public function testItCanClearFilters()
         $this->crudPanel->clearFilters();
         $this->assertCount(0, $this->crudPanel->filters());
     }
+
+    public function testItCanCheckIfFilterIsActiveFromRequest()
+    {
+        $this->crudPanel->setModel(User::class);
+        $request = request()->create('/admin/users', 'GET', ['my_custom_filter' => 'foo']);
+        $request->setRouteResolver(function () use ($request) {
+            return (new Route('GET', 'admin/users', ['UserCrudController', 'index']))->bind($request);
+        });
+        $this->crudPanel->setRequest($request);
+
+        $isActive = CrudFilter::name('my_custom_filter')->isActive();
+        $this->assertTrue($isActive);
+    }
 }