DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactored itemCount() to use existing blah_count fields if they exist

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-01-10 16:16:25 -08:00
parent d508374c57
commit b66cd313b9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/Category.php
View file

@ -98,8 +98,9 @@ class Category extends SnipeModel
*/ */
public function isDeletable() public function isDeletable()
{ {
return Gate::allows('delete', $this) return Gate::allows('delete', $this)
&& ($this->{Str::plural($this->category_type).'_count'} == 0); && ($this->itemCount() == 0);
} }
/** /**
@ -152,7 +153,7 @@ class Category extends SnipeModel
/** /**
* Get the number of items in the category. This should NEVER be used in * Get the number of items in the category. This should NEVER be used in
* a collection of cartegories, as you'll end up with an n+1 query problem. * a collection of categories, as you'll end up with an n+1 query problem.
* *
* It should only be used in a single categoiry context. * It should only be used in a single categoiry context.
* *
@ -162,6 +163,11 @@ class Category extends SnipeModel
*/ */
public function itemCount() public function itemCount()
{ {
if (isset($this->{Str::plural($this->category_type).'_count'})) {
return $this->{Str::plural($this->category_type).'_count'};
}
switch ($this->category_type) { switch ($this->category_type) {
case 'asset': case 'asset':
return $this->assets()->count(); return $this->assets()->count();
@ -173,9 +179,9 @@ class Category extends SnipeModel
return $this->consumables()->count(); return $this->consumables()->count();
case 'license': case 'license':
return $this->licenses()->count(); return $this->licenses()->count();
default: 0;
} }
return '0';
} }
/** /**