DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed location sorting location instead of rtd

Browse source
This commit is contained in:
snipe 2017-11-16 16:49:48 -08:00
parent 7321c5937f
commit 897bd2c56e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Asset.php
View file

@ -1147,7 +1147,7 @@ class Asset extends Depreciable
*/ */
public function scopeOrderLocation($query, $order) public function scopeOrderLocation($query, $order)
{ {
return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('asset_locations.name', $order); return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.location_id')->orderBy('asset_locations.name', $order);
} }
@ -1175,7 +1175,7 @@ class Asset extends Depreciable
public function scopeByLocationId($query, $search) public function scopeByLocationId($query, $search)
{ {
return $query->where(function ($query) use ($search) { return $query->where(function ($query) use ($search) {
$query->whereHas('defaultLoc', function ($query) use ($search) { $query->whereHas('location', function ($query) use ($search) {
$query->where('locations.id', '=', $search); $query->where('locations.id', '=', $search);
}); });
}); });