Include accessories count
This isn’t exactly right right now Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
889d5da71e
commit
9350a20189
2 changed files with 6 additions and 6 deletions
|
@ -248,7 +248,7 @@ class LocationsController extends Controller
|
||||||
->withCount('rtd_assets as rtd_assets_count')
|
->withCount('rtd_assets as rtd_assets_count')
|
||||||
->withCount('children as children_count')
|
->withCount('children as children_count')
|
||||||
->withCount('users as users_count')
|
->withCount('users as users_count')
|
||||||
->withCount('checkouts as accessories_count')
|
->withCount('accessories as accessories_count')
|
||||||
->findOrFail($id);
|
->findOrFail($id);
|
||||||
|
|
||||||
if (! $location->isDeletable()) {
|
if (! $location->isDeletable()) {
|
||||||
|
|
|
@ -108,11 +108,11 @@ class Location extends SnipeModel
|
||||||
{
|
{
|
||||||
|
|
||||||
return Gate::allows('delete', $this)
|
return Gate::allows('delete', $this)
|
||||||
&& ($this->assets_count === 0)
|
&& ($this->assets_count == 0)
|
||||||
&& ($this->assigned_assets_count === 0)
|
&& ($this->assigned_assets_count == 0)
|
||||||
&& ($this->children_count === 0)
|
&& ($this->children_count == 0)
|
||||||
&& ($this->accessories_count === 0)
|
&& ($this->accessories_count == 0)
|
||||||
&& ($this->users_count === 0);
|
&& ($this->users_count == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue