Fixed relationship to return actual assets

snipe · Nov 3, 2015 · d0eed67 · d0eed67
1 parent 9cc542a
commit d0eed67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/Location.php b/app/models/Location.php
@@ -21,7 +21,7 @@ public function users() {
     }
 
     public function assets() {
-        return $this->hasMany('Actionlog','location_id');
+        return $this->hasManyThrough('Asset', 'Actionlog', 'location_id', 'id');
     }
 
     public function assignedassets() {
@@ -104,7 +104,7 @@ public function scopeTextsearch($query, $search)
                 ->orWhere('city', 'LIKE', "%$search%")
                 ->orWhere('state', 'LIKE', "%$search%")
                 ->orWhere('zip', 'LIKE', "%$search%")
-                
+
                 // This doesn't actually work - need to use a table alias maybe?
                 ->orWhere(function($query) use ($search) {
                     $query->whereHas('parent', function($query) use ($search) {