DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-05-16 12:32:05 -07:00
parent 891660d4ea 0ab37af7ab
commit 708385e23a
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ class LocationsController extends Controller
{
$this->authorize('view', Location::class);
$allowed_columns = ['id','name','address','address2','city','state','country','zip','created_at',
'updated_at'];
'updated_at','parent_id'];
$locations = Location::select([
'locations.id',

7
app/Http/Transformers/LocationsTransformer.php
View file

@ -26,6 +26,11 @@ class LocationsTransformer
foreach($location->assets() as $asset) {
$assets_arr = ['id' => $asset->id];
}
$children_arr = [];
foreach($location->childLocations() as $child) {
$children_arr = ['id' => $child->id];
}
$array = [
'id' => e($location->id),
@ -39,6 +44,8 @@ class LocationsTransformer
'assets' => $assets_arr,
'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
'parent_id' => e($location->parent_id),
'children' => $children_arr,
];
$permissions_array['available_actions'] = [