Merge branch 'spidev' into 'master'

Device Bugfix

See merge request fronk/thetool!947
This commit is contained in:
Daniel Spitzer
2025-01-26 09:10:36 +00:00

View File

@@ -399,8 +399,7 @@ class DeviceController extends mfBaseController
foreach ($devices as $device) {
$locationText = "";
$locationUrl = "";
if (isset($device->pop) && trim($device->pop->name)) {
if ($device->pop_id && trim($device->pop->name)) {
$locationText = $device->pop->name;
$locationUrl = self::getUrl("Pop", "Detail", ["id" => $device->pop->id]);
} else if (trim($device->addr_street)) {