Forráskód Böngészése

fix filters, russian roles names

Alexander Musikhin 1 hete
szülő
commit
098300967a

+ 3 - 0
app/Http/Controllers/FilterController.php

@@ -59,6 +59,9 @@ class FilterController extends Controller
      * Ключ — имя таблицы, затем реальный столбец.
      */
     const VALUE_MAP = [
+        'users' => [
+            'role' => \App\Models\Role::NAMES,
+        ],
         'notifications' => [
             'type' => [
                 'platform' => 'Площадки',

+ 6 - 0
app/Http/Controllers/UserController.php

@@ -51,6 +51,12 @@ class UserController extends Controller
         $this->createFilters($model, 'role');
         $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();
         $this->acceptFilters($q, $request);
         $this->acceptSearch($q, $request);

+ 2 - 0
resources/views/partials/table.blade.php

@@ -231,6 +231,8 @@
                             @endif
                         @elseif($id === 'notifications' && $headerName === 'created_at')
                             {{ $string->created_at?->format('d.m.Y H:i') }}
+                        @elseif($id === 'users' && $headerName === 'role')
+                            {{ \App\Models\Role::NAMES[$string->role] ?? $string->role }}
                         @elseif($headerName === 'actions' && isset($routeName) && isset($string->id))
                             <a href="{{ route($routeName, $string->id) }}" class="btn btn-sm btn-outline-primary">
                                 Редактировать