DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed Call to a member function count() on null for location delete

Browse source
This commit is contained in:
snipe 2019-12-11 10:46:07 -08:00
parent a8bbb951bc
commit a5b180a9c6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/LocationsController.php
View file

@ -199,16 +199,16 @@ class LocationsController extends Controller
return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found')); return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.not_found'));
} }
if ($location->users()->count() > 0) { if (($location->users()) && ($location->users()->count() > 0)) {
return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users')); return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_users'));
} elseif ($location->children->count() > 0) { } elseif (($location->children) && ($location->children->count() > 0)) {
return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_child_loc')); return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_child_loc'));
} elseif ($location->assets()->count() > 0) { } elseif (($location->assets()) && ($location->assets()->count() > 0)) {
return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets')); return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
} elseif ($location->assignedassets()->count() > 0) { } elseif (($location->assignedassets()) && ($location->assignedassets()->count() > 0)) {
return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets')); return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.assoc_assets'));
} }