Merge-Konflikt in DeviceController.php behoben

This commit is contained in:
Daniel Spitzer
2025-02-11 15:27:26 +01:00
63 changed files with 3041 additions and 933 deletions

View File

@@ -417,9 +417,9 @@ class DeviceController extends mfBaseController
private function getDevices()
{
if (!$this->me->is(["Admin"])) {
if ($this->allowedPops === null) return [];
}
if ($this->allowedPops === null) return [];
$devices = DeviceModel::search(['popIds' => $this->allowedPops]);
foreach ($devices as $device) {