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

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed network permissions for Building

See merge request fronk/thetool!31
This commit is contained in:
Frank Schubert
2023-06-10 11:10:55 +00:00
parent da7b6bf73e 81dfd78529
commit d04bcd4252
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/Building/BuildingController.php
View File

@@ -45,7 +45,7 @@ class BuildingController extends mfBaseController {
} else {
$use_filter_network = false;
$my_networks = $this->me->my_networks;
$my_networks = $this->me->myNetworks(["netowner","pipeplanner"]);
foreach($my_networks as $mn) {
if($mn->id == $filter['network_id']) {
@@ -54,12 +54,13 @@ class BuildingController extends mfBaseController {
}
}
$this->layout()->set("mynetworks", $my_networks);
if($use_filter_network) {
$my_networks = [];
$my_networks[] = new Network($filter['network_id']);
}
$this->layout()->set("mynetworks", $this->me->my_networks);
}
unset($filter['network_id']);

2
application/Pipework/PipeworkController.php
View File

@@ -71,7 +71,7 @@ class PipeworkController extends mfBaseController {
}
}
$this->layout()->set("mynetworks", $this->me->my_networks);
$this->layout()->set("mynetworks", $my_networks);
if($use_filter_network) {
$my_networks = [];