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

Fixed network filtering in pipe-/linework/patching

Browse Source
This commit is contained in:
Frank Schubert
2023-06-10 12:34:10 +02:00
parent a36ef1580e
commit 9e8bec5361
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/menu.php
+2 -2
View File
@@ -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"])): ?><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","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","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","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","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> </ul>
</li> </li>
<?php endif; ?> <?php endif; ?>
application/Linework/LineworkController.php
+3 -3
View File
@@ -63,7 +63,7 @@ class LineworkController extends mfBaseController {
$this->layout()->set("mynetworks", NetworkModel::getAll()); $this->layout()->set("mynetworks", NetworkModel::getAll());
} else { } else {
$use_filter_network = false; $use_filter_network = false;
$my_networks = $this->me->my_networks; $my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
foreach($my_networks as $mn) { foreach($my_networks as $mn) {
if($mn->id == $filter['network_id']) { if($mn->id == $filter['network_id']) {
@@ -72,13 +72,13 @@ class LineworkController extends mfBaseController {
} }
} }
$this->layout()->set("mynetworks", $my_networks);
if($use_filter_network) { if($use_filter_network) {
$my_networks = []; $my_networks = [];
$my_networks[] = new Network($filter['network_id']); $my_networks[] = new Network($filter['network_id']);
} }
$this->layout()->set("mynetworks", $this->me->my_networks);
} }
unset($filter['network_id']); unset($filter['network_id']);
application/Patching/PatchingController.php
+3 -2
View File
@@ -42,7 +42,7 @@ class PatchingController extends mfBaseController {
$this->layout()->set("mynetworks", NetworkModel::getAll()); $this->layout()->set("mynetworks", NetworkModel::getAll());
} else { } else {
$use_filter_network = false; $use_filter_network = false;
$my_networks = $this->me->my_networks; $my_networks = $this->me->myNetworks(["netowner", "netoperator", "lineworker"]);
foreach($my_networks as $mn) { foreach($my_networks as $mn) {
if($mn->id == $filter['network_id']) { if($mn->id == $filter['network_id']) {
@@ -51,12 +51,13 @@ class PatchingController extends mfBaseController {
} }
} }
$this->layout()->set("mynetworks", $my_networks);
if($use_filter_network) { if($use_filter_network) {
$my_networks = []; $my_networks = [];
$my_networks[] = new Network($filter['network_id']); $my_networks[] = new Network($filter['network_id']);
} }
$this->layout()->set("mynetworks", $this->me->my_networks);
} }
unset($filter['network_id']); unset($filter['network_id']);
application/Pipework/PipeworkController.php
+3 -2
View File
@@ -62,7 +62,7 @@ class PipeworkController extends mfBaseController {
$this->layout()->set("mynetworks", NetworkModel::getAll()); $this->layout()->set("mynetworks", NetworkModel::getAll());
} else { } else {
$use_filter_network = false; $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) { foreach($my_networks as $mn) {
if($mn->id == $filter['network_id']) { 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) { if($use_filter_network) {
$my_networks = []; $my_networks = [];
$my_networks[] = new Network($filter['network_id']); $my_networks[] = new Network($filter['network_id']);
} }
$this->layout()->set("mynetworks", $this->me->my_networks);
} }
unset($filter['network_id']); unset($filter['network_id']);