ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #3724 - adds edit/delete button back to companies listing

Browse Source
This commit is contained in:
snipe
2017-07-07 17:10:06 -07:00
parent 06c04bf271
commit 31cabaa4db
4 changed files with 151 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/CompaniesController.php
+6 -3
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Api;
use App\Http\Transformers\DatatablesTransformer;
use App\Http\Transformers\CompaniesTransformer;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Helpers\Helper;
@@ -23,7 +23,10 @@ class CompaniesController extends Controller
$allowed_columns = ['id','name'];
$companies = Company::withCount('assets','licenses','accessories','consumables','components','users');
$companies = Company::withCount('assets','licenses','accessories','consumables','components','users')
->withCount('users')->withCount('users')->withCount('assets')
->withCount('licenses')->withCount('accessories')
->withCount('consumables')->withCount('components');
if ($request->has('search')) {
$companies->TextSearch($request->input('search'));
@@ -37,7 +40,7 @@ class CompaniesController extends Controller
$total = $companies->count();
$companies = $companies->skip($offset)->take($limit)->get();
return (new DatatablesTransformer)->transformDatatables($companies, $total);
return (new CompaniesTransformer)->transformCompanies($companies, $total);
}