Fixes #906 - groups view

2017-10-17 21:43:57 -07:00
parent 665a113ed8
commit c069829b33
9 changed files with 112 additions and 70 deletions
@@ -57,7 +57,6 @@ class UsersController extends Controller
            $users = $users->GetDeleted();
        }

-
        if ($request->has('company_id')) {
            $users = $users->where('company_id', '=', $request->input('company_id'));
        }
@@ -65,6 +64,10 @@ class UsersController extends Controller
        if ($request->has('location_id')) {
            $users = $users->where('location_id', '=', $request->input('location_id'));
        }
+        
+        if ($request->has('group_id')) {
+            $users = $users->ByGroup($request->has('group_id'));
+        }

        if ($request->has('department_id')) {
            $users = $users->where('department_id','=',$request->input('department_id'));