mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix world map when location has been deleted that a device still references (#9997)

Browse Source
This commit is contained in:
Tony Murray
2019-03-19 06:52:20 -05:00
committed by GitHub
parent bc24d39bf1
commit edd18b4f9f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Widgets/WorldMapController.php
View File

@@ -63,7 +63,7 @@ class WorldMapController extends WidgetController
->get()
->filter(function ($device) use ($status) {
/** @var Device $device */
if (!($device->location_id && $device->location->coordinatesValid())) {
if (!($device->location_id && $device->location && $device->location->coordinatesValid())) {
return false;
}

2
html/includes/dev-overview-data.inc.php
View File

@@ -113,7 +113,7 @@ if ($device['location_id']) {
$maps_engine = $maps_api ? Config::get('geoloc.engine') : '';
$location = Location::find($device['location_id']);
$location_valid = $location && $location->coordinatesValid();
$location_valid = ($location && $location->coordinatesValid());
$location_coords = $location_valid ? $location->lat . ', ' . $location->lng : 'N/A';
echo '