|
@@ -32,7 +32,7 @@ class Selector
|
|
|
/**
|
|
|
* @var string
|
|
|
*/
|
|
|
- protected $queryKey;
|
|
|
+ protected $queryName;
|
|
|
|
|
|
/**
|
|
|
* Selector constructor.
|
|
@@ -43,7 +43,7 @@ class Selector
|
|
|
$this->request = request();
|
|
|
$this->selectors = new Collection();
|
|
|
|
|
|
- $this->queryKey = $grid->getName().'_selector';
|
|
|
+ $this->queryName = $grid->getName().'_selector';
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -118,7 +118,7 @@ class Selector
|
|
|
return $this->selected;
|
|
|
}
|
|
|
|
|
|
- $selected = $this->request->input($this->queryKey, []);
|
|
|
+ $selected = $this->request->input($this->queryName, []);
|
|
|
if (! is_array($selected)) {
|
|
|
return [];
|
|
|
}
|
|
@@ -150,7 +150,7 @@ class Selector
|
|
|
$options = Arr::get($selected, $column, []);
|
|
|
|
|
|
if (is_null($value)) {
|
|
|
- Arr::forget($query, "{$this->queryKey}.{$column}");
|
|
|
+ Arr::forget($query, "{$this->queryName}.{$column}");
|
|
|
|
|
|
return $this->request->fullUrlWithQuery($query);
|
|
|
}
|
|
@@ -165,9 +165,9 @@ class Selector
|
|
|
}
|
|
|
|
|
|
if (! empty($options)) {
|
|
|
- Arr::set($query, "{$this->queryKey}.{$column}", implode(',', $options));
|
|
|
+ Arr::set($query, "{$this->queryName}.{$column}", implode(',', $options));
|
|
|
} else {
|
|
|
- Arr::forget($query, "{$this->queryKey}.{$column}");
|
|
|
+ Arr::forget($query, "{$this->queryName}.{$column}");
|
|
|
}
|
|
|
|
|
|
return $this->request->fullUrlWithQuery($query);
|