From 9e8bec53616fd46db6ea4b8fdb4709e487325666 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Sat, 10 Jun 2023 12:34:10 +0200
Subject: [PATCH] Fixed network filtering in pipe-/linework/patching

---
 Layout/default/menu.php                     | 4 ++--
 application/Linework/LineworkController.php | 6 +++---
 application/Patching/PatchingController.php | 5 +++--
 application/Pipework/PipeworkController.php | 5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index de282cb6b..2c76f8bed 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -73,8 +73,8 @@
               <?php if($me->is(["Admin","netowner","pipeplanner"])): ?><li><a href="<?=self::getUrl("Building")?>"><i class="fas fa-city text-info"></i> Objekte & Anschlüsse</a></li><?php endif; ?>
               <?php if($me->is(["Admin","netowner","pipeplanner","pipeworker","lineplanner","lineworker"])): ?><li><a href="<?=self::getUrl("Pipework")?>"><i class="fad fa-wrench text-info"></i> Tiefbau</a></li><?php endif; ?>
               <?php if($me->is(["Admin","netowner","lineplanner","lineworker"])): ?><li><a href="<?=self::getUrl("Linework")?>"><i class="fas fa-ethernet text-info"></i> Leitungsbau</a></li><?php endif; ?>
-              <?php if($me->is(["Admin", "netowner", "netoperator", "lineworker"])): ?><li class="has-sub-submenu"><a href="<?=self::getUrl("Patching")?>"><i class="fas fa-plug text-info"></i> Patchungen</a></li><?php endif; ?>
-              <?php if($me->is(["Admin", "netowner","pipeplanner","lineplanner","pipeworker", "netoperator", "lineworker"])): ?><li><a href="<?=self::getUrl("Filestore")?>"><i class="fas fa-file text-info"></i> Dateiablage</a></li><?php endif; ?>
+              <?php if($me->is(["Admin","netowner","netoperator","lineworker"])): ?><li class="has-sub-submenu"><a href="<?=self::getUrl("Patching")?>"><i class="fas fa-plug text-info"></i> Patchungen</a></li><?php endif; ?>
+              <?php if($me->is(["Admin","netowner","pipeplanner","lineplanner","pipeworker","netoperator","lineworker"])): ?><li><a href="<?=self::getUrl("Filestore")?>"><i class="fas fa-file text-info"></i> Dateiablage</a></li><?php endif; ?>
             </ul>
           </li>
           <?php endif; ?>
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index 8b9a73da0..d7c9b4731 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -63,7 +63,7 @@ class LineworkController extends mfBaseController {
       $this->layout()->set("mynetworks", NetworkModel::getAll());
     } else {
       $use_filter_network = false;
-      $my_networks = $this->me->my_networks;
+      $my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
       
       foreach($my_networks as $mn) {
         if($mn->id == $filter['network_id']) {
@@ -72,13 +72,13 @@ class LineworkController 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']);
     
diff --git a/application/Patching/PatchingController.php b/application/Patching/PatchingController.php
index 9f9ed1777..4ac780699 100644
--- a/application/Patching/PatchingController.php
+++ b/application/Patching/PatchingController.php
@@ -42,7 +42,7 @@ class PatchingController extends mfBaseController {
       $this->layout()->set("mynetworks", NetworkModel::getAll());
     } else {
       $use_filter_network = false;
-      $my_networks = $this->me->my_networks;
+      $my_networks = $this->me->myNetworks(["netowner", "netoperator", "lineworker"]);
       
       foreach($my_networks as $mn) {
         if($mn->id == $filter['network_id']) {
@@ -51,12 +51,13 @@ class PatchingController 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']);
 
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 001309c9b..46d6a562d 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -62,7 +62,7 @@ class PipeworkController extends mfBaseController {
       $this->layout()->set("mynetworks", NetworkModel::getAll());
     } else {
       $use_filter_network = false;
-      $my_networks = $this->me->my_networks;
+      $my_networks = $this->me->myNetworks(["netowner","pipeplanner","pipeworker","lineplanner","lineworker"]);
       
       foreach($my_networks as $mn) {
         if($mn->id == $filter['network_id']) {
@@ -71,12 +71,13 @@ class PipeworkController extends mfBaseController {
         }
       }
       
+      $this->layout()->set("mynetworks", $this->me->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']);