Fix user firstname/lastname search

snipe · Jul 30, 2015 · 78e0af3 · 78e0af3
1 parent 8bedaf7
commit 78e0af3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -420,10 +420,12 @@ public function scopeTextSearch($query, $search)
 						$query->where('name','LIKE','%'.$search.'%');
 					});
 				})->orWhere(function($query) use ($search) {
-					$query->whereHas('assigneduser', function($query) use ($search) {
-						$query->where('first_name','LIKE','%'.$search.'%')
-						->orWhere('last_name','LIKE','%'.$search.'%');
-					});
+		                    $query->whereHas('assigneduser', function($query) use ($search) {
+		                        $query->where(function($query) use ($search) {
+		                            $query->where('first_name','LIKE','%'.$search.'%')
+		                            ->orWhere('last_name','LIKE','%'.$search.'%');
+		                        });
+		                    });
 				})->orWhere('name','LIKE','%'.$search.'%')
 				->orWhere('asset_tag','LIKE','%'.$search.'%')
 				->orWhere('serial','LIKE','%'.$search.'%')