DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor isDeletable on companies

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-09-19 20:38:34 +01:00
parent d7914e238d
commit b88f2054dd
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class CompaniesController extends Controller
$companies = Company::withCount(['assets as assets_count' => function ($query) { $companies = Company::withCount(['assets as assets_count' => function ($query) {
$query->AssetsForShow(); $query->AssetsForShow();
}])->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count'); }])->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
if ($request->filled('search')) { if ($request->filled('search')) {
$companies->TextSearch($request->input('search')); $companies->TextSearch($request->input('search'));

13
app/Models/Company.php
View file

@ -187,12 +187,15 @@ final class Company extends SnipeModel
*/ */
public function isDeletable() public function isDeletable()
{ {
return Gate::allows('delete', $this) return Gate::allows('delete', $this)
&& ($this->assets()->count() === 0) && (($this->assets_count ?? $this->assets()->count()) === 0)
&& ($this->accessories()->count() === 0) && (($this->accessories_count ?? $this->accessories()->count()) === 0)
&& ($this->consumables()->count() === 0) && (($this->licenses_count ?? $this->licenses()->count()) === 0)
&& ($this->components()->count() === 0) && (($this->components_count ?? $this->components()->count()) === 0)
&& ($this->users()->count() === 0); && (($this->consumables_count ?? $this->consumables()->count()) === 0)
&& (($this->accessories_count ?? $this->accessories()->count()) === 0)
&& (($this->users_count ?? $this->users()->count()) === 0);
} }
/** /**