diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 74a40d47d0..5ab108e081 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -847,6 +847,13 @@ class UsersController extends AdminController {
$users = User::with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc');
+ switch ($status) {
+ case 'deleted':
+ $users = $users->withTrashed()->Deleted();
+ break;
+ }
+
+
if (Input::has('search')) {
$users = $users->TextSearch(Input::get('search'));
@@ -896,7 +903,7 @@ class UsersController extends AdminController {
$rows[] = array(
'checkbox' =>'',
- 'name' => ''.$user->fullName().'',
+ 'name' => ''.$user->fullName().'',
'email' => ($user->email!='') ? '' : '',
'username' => $user->username,
'location' => ($user->location_id!='') ? $user->userloc->name : '',
diff --git a/app/models/User.php b/app/models/User.php
index 1990c690a0..2d99d132fd 100755
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -211,17 +211,32 @@ class User extends SentryUserModel
public function scopeTextsearch($query, $q)
{
- return $query->where(function($query) use ($q)
- {
-
- $query->orWhere('first_name', 'LIKE', "%$q%")
- ->orWhere('first_name', 'LIKE', "%$q%")
- ->orWhere('email', 'LIKE', "%$q%")
- ->orWhere('username', 'LIKE', "%$q%")
- ->orWhere('notes', 'LIKE', "%$q%");
- });
+ return $query->where('first_name', 'LIKE', "%$q%")
+ ->orWhere('last_name', 'LIKE', "%$q%")
+ ->orWhere('email', 'LIKE', "%$q%")
+ ->orWhere('username', 'LIKE', "%$q%")
+ ->orWhere('notes', 'LIKE', "%$q%")
+ ->orWhere(function($query) use ($q) {
+ $query->whereHas('userloc', function($query) use ($q) {
+ $query->where('name','LIKE','%'.$q.'%');
+ });
+ });
}
+ /**
+ * Query builder scope for Deleted users
+ *
+ * @param Illuminate\Database\Query\Builder $query Query builder instance
+ *
+ * @return Illuminate\Database\Query\Builder Modified query builder
+ */
+
+ public function scopeDeleted($query)
+ {
+ return $query->whereNotNull('deleted_at');
+ }
+
+
}
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index d6f7e7963e..22a5ee3a87 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -39,20 +39,26 @@
'route' => ['users/bulkedit'],
'class' => 'form-horizontal' ]) }}
-