Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 98dfb9d1b5a4 · 2020-11-20T14:35:12.000-08:00
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
@@ -68,7 +68,7 @@ public function index(Request $request)
 
         if (($request->filled('deleted')) && ($request->input('deleted')=='true')) {
             $users = $users->onlyTrashed();
-        } elseif (($request->filled('all')) && ($request->input('deleted')=='true')) {
+        } elseif (($request->filled('all')) && ($request->input('all')=='true')) {
             $users = $users->withTrashed();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function index(Request $request)`
`68`	`68`
`69`	`69`	`if (($request->filled('deleted')) && ($request->input('deleted')=='true')) {`
`70`	`70`	`$users = $users->onlyTrashed();`
`71`		`- } elseif (($request->filled('all')) && ($request->input('deleted')=='true')) {`
	`71`	`+ } elseif (($request->filled('all')) && ($request->input('all')=='true')) {`
`72`	`72`	`$users = $users->withTrashed();`
`73`	`73`	`}`
`74`	`74`