diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php index ce2414ab33..897d127580 100755 --- a/app/Http/Controllers/LocationsController.php +++ b/app/Http/Controllers/LocationsController.php @@ -320,7 +320,12 @@ class LocationsController extends Controller $locations_raw_array = $request->input('ids'); if ((is_array($locations_raw_array)) && (count($locations_raw_array) > 0)) { - $locations = Location::whereIn('id', $locations_raw_array)->get(); + $locations = Location::whereIn('id', $locations_raw_array) + ->withCount('assignedAssets as assigned_assets_count') + ->withCount('assets as assets_count') + ->withCount('rtd_assets as rtd_assets_count') + ->withCount('children as children_count') + ->withCount('users as users_count')->get(); $success_count = 0; $error_count = 0; diff --git a/app/Models/Location.php b/app/Models/Location.php index a27f760ea6..9f4c551264 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -108,10 +108,10 @@ class Location extends SnipeModel { return Gate::allows('delete', $this) - && ($this->assets_count == 0) - && ($this->assigned_assets_count == 0) - && ($this->children_count == 0) - && ($this->users_count == 0); + && ($this->assets_count === 0) + && ($this->assigned_assets_count === 0) + && ($this->children_count === 0) + && ($this->users_count === 0); } /**