Browse Source

update: user filter

Tokumeikoi 4 years ago
parent
commit
550a787c1a

+ 7 - 7
app/Http/Controllers/Admin/UserController.php

@@ -19,17 +19,17 @@ class UserController extends Controller
     private function filter(Request $request, $builder)
     {
         if ($request->input('filter')) {
-            $request->validate([
-                'filter' => 'array',
-                'filter.*.key' => 'required|in:email,transfer_enable,d,expired_at,uuid,token',
-                'filter.*.condition' => 'required|in:>,<,=,>=,<=',
-                'filter.*.value' => 'required'
-            ]);
             foreach ($request->input('filter') as $filter) {
-                if ($filter['key'] === 'email' && $filter['condition'] === '=') {
+                if ($filter['key'] === 'email') {
                     $builder->where($filter['key'], 'like', '%' . $filter['value'] . '%');
                     continue;
                 }
+                if ($filter['key'] === 'invite_by_email') {
+                    $user = User::where('email', $filter['value'])->first();
+                    if (!$user) continue;
+                    $builder->where('invite_user_id', $user->id);
+                    continue;
+                }
                 if ($filter['key'] === 'd' || $filter['key'] === 'transfer_enable') {
                     $filter['value'] = $filter['value'] * 1073741824;
                 }

+ 1 - 1
app/Http/Requests/Admin/UserFetch.php

@@ -14,7 +14,7 @@ class UserFetch extends FormRequest
     public function rules()
     {
         return [
-            'filter.*.key' => 'required|in:email,transfer_enable,d,expired_at,uuid,token',
+            'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id',
             'filter.*.condition' => 'required|in:>,<,=,>=,<=',
             'filter.*.value' => 'required'
         ];

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


Some files were not shown because too many files changed in this diff