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 not saving baufreigabe when no permission in Pipework

See merge request fronk/thetool!203
This commit is contained in:
Frank Schubert
2024-01-30 17:29:06 +00:00
parent 213c9ea87c 7aaa73de39
commit 67a8389705
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Layout/default/Linework/Index.php
View File

@@ -152,7 +152,7 @@
foreach($terminations as $term): ?> foreach($terminations as $term): ?>
<?php if($bcount > 0): ?> <?php if($bcount > 0): ?>
<tr id="termination-<?=$term->id?>-top-header" class="hidden" data-last-save="<?=$term->edit?>"> <tr id="termination-<?=$term->id?>-top-header" class="hidden">
<th>Anschluss</th> <th>Anschluss</th>
<th>Tiefbau</th> <th>Tiefbau</th>
<th>Patch-/Kabeldaten</th> <th>Patch-/Kabeldaten</th>
@@ -590,10 +590,6 @@ function togglePipework(id) {
} }
function validateWorkflowItem(id) { function validateWorkflowItem(id) {
// disable saving if timestamp changed
var required_fields = { var required_fields = {
pop_id: "int", pop_id: "int",
schrank: "string", schrank: "string",

2
application/Pipework/PipeworkController.php
View File

@@ -300,7 +300,7 @@ class PipeworkController extends mfBaseController {
//var_dump($r->get());exit; //var_dump($r->get());exit;
if($this->me->is(["Admin", "netowner", "pipeplanner"])) { if($r->isset("pipework_enabled") && $this->me->is(["Admin", "pipeplanner"])) {
if($r->pipework_enabled == 1 && $building->pipework_enabled != 1) { if($r->pipework_enabled == 1 && $building->pipework_enabled != 1) {
$building->pipework_enabled = 1; $building->pipework_enabled = 1;
$building->pipework_enabled_date = date('U'); $building->pipework_enabled_date = date('U');