Merge branch 'fronkdev' into 'master'

Fixed not saving baufreigabe when no permission in Pipework

See merge request fronk/thetool!203

Layout/default/Linework/Index.php

@@ -152,7 +152,7 @@
                   foreach($terminations as $term): ?>
                   
                     <?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>Tiefbau</th>
                     <th>Patch-/Kabeldaten</th>
@@ -590,10 +590,6 @@ function togglePipework(id) {
 }
 
 function validateWorkflowItem(id) {
-  // disable saving if timestamp changed
-  
-  
-  
   var required_fields = {
       pop_id: "int",
       schrank: "string",

application/Pipework/PipeworkController.php

@@ -300,7 +300,7 @@ class PipeworkController extends mfBaseController {
     
     //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) {
         $building->pipework_enabled = 1;
         $building->pipework_enabled_date = date('U');