fix(users): ensure search filters are properly applied

warlof · Jul 14, 2019 · 7495c42 · 7495c42
1 parent d84518f
commit 7495c42
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Http/Controllers/DiscordController.php b/src/Http/Controllers/DiscordController.php
@@ -101,6 +101,15 @@ public function getUsersData()
             ->editColumn('nick', function($row){
                 return $row->nick;
             })
+            ->filterColumn('user_name', function ($query, $keyword) {
+                $sql = 'LOWER(' . (new CharacterInfo())->getTable() . '.name) LIKE ?';
+                $query->orWhereRaw($sql, ["%{$keyword}%"]);
+            })
+            ->orderColumn('user_id', '-value $1')
+            ->filterColumn('user_id', function ($query, $keyword) {
+                $sql = 'LOWER(' . (new UserSetting())->getTable() . '.value) LIKE ?';
+                $query->orWhereRaw($sql, ["%{$keyword}%"]);
+            })
             ->removeColumn('refresh_token')
             ->removeColumn('access_token')
             ->removeColumn('expires_at')

diff --git a/src/resources/views/users/list.blade.php b/src/resources/views/users/list.blade.php
@@ -62,7 +62,8 @@
                     data: null,
                     targets: -1,
                     defaultContent: '<button class="btn btn-xs btn-info">Roles</button> <button class="btn btn-xs btn-danger">Remove</button>',
-                    orderable: false
+                    orderable: false,
+                    searchable: false
                 }
                 @endif
             ],