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

Fixed orderby parent location name

Browse source
This commit is contained in:
snipe 2018-02-21 02:17:18 -08:00
parent 5fcbf9091e
commit 0d7a43ab38
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Api/LocationsController.php
View file

@ -23,7 +23,7 @@ class LocationsController extends Controller
$this->authorize('view', Location::class); $this->authorize('view', Location::class);
$allowed_columns = [ $allowed_columns = [
'id','name','address','address2','city','state','country','zip','created_at', 'id','name','address','address2','city','state','country','zip','created_at',
'updated_at','parent_id', 'manager_id','image', 'updated_at','manager_id','image',
'assigned_assets_count','users_count','assets_count','currency']; 'assigned_assets_count','users_count','assets_count','currency'];
$locations = Location::with('parent', 'manager', 'childLocations')->select([ $locations = Location::with('parent', 'manager', 'childLocations')->select([
@ -49,11 +49,22 @@ class LocationsController extends Controller
$locations = $locations->TextSearch($request->input('search')); $locations = $locations->TextSearch($request->input('search'));
} }
$offset = $request->input('offset', 0); $offset = $request->input('offset', 0);
$limit = $request->input('limit', 50); $limit = $request->input('limit', 50);
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
$locations->orderBy($sort, $order);
switch ($request->input('sort')) {
case 'parent':
$locations->OrderParent($order);
break;
default:
$locations->orderBy($sort, $order);
break;
}
$total = $locations->count(); $total = $locations->count();
$locations = $locations->skip($offset)->take($limit)->get(); $locations = $locations->skip($offset)->take($limit)->get();