Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Devicecontroller Bugfix

Browse Source 
* Admin hat keine Devices mehr gesehen
This commit is contained in:
Daniel Spitzer
2025-02-11 15:00:53 +01:00
parent 6ed34fe676
commit 23185bedb5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/Device/DeviceController.php
View File

@@ -18,7 +18,7 @@ class DeviceController extends mfBaseController
$this->allowedPops = null;
} else {
$networkIds = array_column($this->me->getProperty('my_networks'), 'id');
$pops=PopNetworkModel::search(['Networks' => $networkIds]);
$pops = PopNetworkModel::search(['Networks' => $networkIds]);
foreach ($pops as $pop) {
$popIds[] = $pop->pop_id;
}
@@ -28,7 +28,7 @@ class DeviceController extends mfBaseController
protected function indexAction()
{
$deviceManufacturers = array_map(function($deviceManufacturer) {
$deviceManufacturers = array_map(function ($deviceManufacturer) {
return [
"id" => $deviceManufacturer->id,
"name" => $deviceManufacturer->name,
@@ -37,7 +37,7 @@ class DeviceController extends mfBaseController
];
}, DevicemanufactorModel::getAll());
$deviceTypes = array_map(function($deviceType) {
$deviceTypes = array_map(function ($deviceType) {
return [
"id" => $deviceType->id,
"name" => $deviceType->name,
@@ -96,7 +96,7 @@ class DeviceController extends mfBaseController
$this->layout()->setTemplate("Device/Detail");
$devicesconfig = DeviceModel::getconifg($id);
$devices = DeviceModel::getOne($id);
$devicesall= DeviceModel::getAll();
$devicesall = DeviceModel::getAll();
if ($devices->devicetype->olt == "1") {
$customer = DeviceModel::getOltCustomer($device->ip);
@@ -417,6 +417,9 @@ class DeviceController extends mfBaseController
private function getDevices()
{
if (!$this->me->is(["Admin"])) {
if ($this->allowedPops === null) return [];
}
$devices = DeviceModel::search(['popIds' => $this->allowedPops]);
foreach ($devices as $device) {