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

Clean up Transformers and extract an isDeletable() method to models where it makes sense.

Browse Source
This commit is contained in:
Daniel Meltzer
2020-05-23 13:36:02 -04:00
parent 136df9418f
commit f0546bf689
32 changed files with 173 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ManufacturersController.php
+3 -3
View File
@@ -125,15 +125,15 @@ class ManufacturersController extends Controller
{
$this->authorize('delete', Manufacturer::class);
$manufacturer = Manufacturer::withCount('assets as assets_count', 'licenses as licenses_count', 'consumables as consumables_count', 'accessories as accessories_count', 'models as models_count' )->findOrFail($id);
$manufacturer = Manufacturer::findOrFail($id);
$this->authorize('delete', $manufacturer);
if (($manufacturer->assets_count == 0) && ($manufacturer->licenses_count==0) && ($manufacturer->consumables_count==0) && ($manufacturer->accessories_count==0) && ($manufacturer->models_count==0) && ($manufacturer->deleted_at=='')) {
if ($manufacturer->isDeletable()) {
$manufacturer->delete();
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success')));
}
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.delete.error')));
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users')));