mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-14 01:24:06 -08:00
Removed dupes
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
62407179cd
commit
b3cd9531cb
|
@ -47,9 +47,8 @@ class LocationsController extends Controller
|
||||||
'assigned_accessories_count',
|
'assigned_accessories_count',
|
||||||
'users_count',
|
'users_count',
|
||||||
'assets_count',
|
'assets_count',
|
||||||
'assigned_assets_count',
|
|
||||||
'assets_count',
|
|
||||||
'rtd_assets_count',
|
'rtd_assets_count',
|
||||||
|
'accessories_count',
|
||||||
'currency',
|
'currency',
|
||||||
'ldap_ou',
|
'ldap_ou',
|
||||||
];
|
];
|
||||||
|
@ -243,14 +242,14 @@ class LocationsController extends Controller
|
||||||
{
|
{
|
||||||
$this->authorize('view', Accessory::class);
|
$this->authorize('view', Accessory::class);
|
||||||
$this->authorize('view', $location);
|
$this->authorize('view', $location);
|
||||||
$accessory_checkouts = AccessoryCheckout::LocationAssigned()->with('admin')->where('assigned_to', '=', $location->id);
|
$accessory_checkouts = AccessoryCheckout::LocationAssigned()->with('admin')->with('accessories')->where('assigned_to', '=', $location->id);
|
||||||
|
|
||||||
$offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
|
$offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
|
||||||
$limit = app('api_limit_value');
|
$limit = app('api_limit_value');
|
||||||
|
|
||||||
$total = $accessory_checkouts->count();
|
$total = $accessory_checkouts->count();
|
||||||
$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
|
$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
|
||||||
return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_checkouts, $total);
|
return (new LocationsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue