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

Fixes #3858 - use transformer for single listing categories

Browse source
This commit is contained in:
snipe 2017-08-22 14:26:08 -07:00
parent d2535582f3
commit 31516abef9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Api/CategoriesController.php
View file

@ -22,7 +22,7 @@ class CategoriesController extends Controller
$this->authorize('view', Category::class); $this->authorize('view', Category::class);
$allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email']; $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email'];
$categories = Category::select(['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email']) $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email'])
->withCount('assets', 'accessories', 'consumables', 'components'); ->withCount('assets', 'accessories', 'consumables', 'components');
if ($request->has('search')) { if ($request->has('search')) {
@ -75,7 +75,8 @@ class CategoriesController extends Controller
{ {
$this->authorize('view', Category::class); $this->authorize('view', Category::class);
$category = Category::findOrFail($id); $category = Category::findOrFail($id);
return $category; return (new CategoriesTransformer)->transformCategory($category);
} }

4
app/Http/Transformers/CategoriesTransformer.php
View file

@ -4,6 +4,7 @@ namespace App\Http\Transformers;
use App\Models\Category; use App\Models\Category;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Gate; use Gate;
use App\Helpers\Helper;
class CategoriesTransformer class CategoriesTransformer
{ {
@ -26,11 +27,14 @@ class CategoriesTransformer
'name' => e($category->name), 'name' => e($category->name),
'type' => e($category->category_type), 'type' => e($category->category_type),
'use_default_eula' => ($category->use_default_eula =='1') ? true : false, 'use_default_eula' => ($category->use_default_eula =='1') ? true : false,
'checkin_email' => ($category->checkin_email =='1') ? true : false,
'require_acceptance' => ($category->require_acceptance =='1') ? true : false, 'require_acceptance' => ($category->require_acceptance =='1') ? true : false,
'assets_count' => $category->assets_count, 'assets_count' => $category->assets_count,
'accessories_count' => $category->accessories_count, 'accessories_count' => $category->accessories_count,
'consumables_count' => $category->consumables_count, 'consumables_count' => $category->consumables_count,
'components_count' => $category->components_count, 'components_count' => $category->components_count,
'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
]; ];
$permissions_array['available_actions'] = [ $permissions_array['available_actions'] = [