|
@@ -51,6 +51,12 @@ class UserController extends Controller
|
|
|
$this->createFilters($model, 'role');
|
|
$this->createFilters($model, 'role');
|
|
|
$this->createDateFilters($model, 'created_at');
|
|
$this->createDateFilters($model, 'created_at');
|
|
|
|
|
|
|
|
|
|
+ if (isset($this->data['filters']['role']['values'])) {
|
|
|
|
|
+ foreach ($this->data['filters']['role']['values'] as $key => $value) {
|
|
|
|
|
+ $this->data['filters']['role']['values'][$key] = \App\Models\Role::NAMES[$key] ?? $value;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$q = $model::query();
|
|
$q = $model::query();
|
|
|
$this->acceptFilters($q, $request);
|
|
$this->acceptFilters($q, $request);
|
|
|
$this->acceptSearch($q, $request);
|
|
$this->acceptSearch($q, $request);
|