@@ -66,8 +66,8 @@ public function __construct($options, $values, $logic, $fallbackLogic)
6666 $ this ->fallbackLogic = $ fallbackLogic ;
6767 }
6868
69- if ($ this -> crud ()-> getRequest ()->has ($ this ->name )) {
70- $ this ->currentValue = $ this -> crud ()-> getRequest ()->input ($ this ->name );
69+ if (request ()->has ($ this ->name )) {
70+ $ this ->currentValue = request ()->input ($ this ->name );
7171 }
7272 }
7373
@@ -79,7 +79,7 @@ public function __construct($options, $values, $logic, $fallbackLogic)
7979 */
8080 public function isActive ()
8181 {
82- if ($ this -> crud ()-> getRequest ()->has ($ this ->name )) {
82+ if (request ()->has ($ this ->name )) {
8383 return true ;
8484 }
8585
@@ -123,7 +123,7 @@ public function apply($input = null)
123123 $ input = new ParameterBag ($ input );
124124 }
125125
126- $ input = $ input ?? new ParameterBag ($ this -> crud ()-> getRequest ()->all ());
126+ $ input = $ input ?? new ParameterBag (request ()->all ());
127127
128128 if (! $ input ->has ($ this ->name )) {
129129 // if fallback logic was supplied and is a closure
@@ -220,26 +220,6 @@ public function forget($attribute)
220220 return $ this ;
221221 }
222222
223- /**
224- * Remove an attribute from one field's definition array.
225- * (unused function).
226- *
227- * @param string $field The name of the field.
228- * @param string $attribute The name of the attribute being removed.
229- *
230- * @codeCoverageIgnore
231- *
232- * @deprecated
233- */
234- public function removeFilterAttribute ($ filter , $ attribute )
235- {
236- $ fields = $ this ->fields ();
237-
238- unset($ fields [$ field ][$ attribute ]);
239-
240- $ this ->setOperationSetting ('fields ' , $ fields );
241- }
242-
243223 /**
244224 * Move the current filter after another filter.
245225 *
0 commit comments