From 97eac977f85b1f6208705bced518bb975be5292a Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Wed, 16 Feb 2022 11:19:39 +0100 Subject: [PATCH] fixed Linework Patchdata check --- Layout/default/Linework/Index.php | 2 +- application/Termination/Termination.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 9ee4196f7..4889330d9 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -187,7 +187,7 @@ - building->getWorkflowvalue('pipework_finished') && empty($term->building->getWorkflowvalue('ist_pipework_finished')))) ? "" : ""?> + building->getWorkflowvalue('pipework_finished'))) ? "" : ""?> isWorkflowPatchingDone()) ? "" : "" ?> getWorkflowvalue('backbone_finished') != "1") ? "" : "" ?> getWorkflowvalue('bep_deployed') != "1") ? "" : "" ?> diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php index 50210b2f2..d81af0af7 100644 --- a/application/Termination/Termination.php +++ b/application/Termination/Termination.php @@ -143,7 +143,7 @@ class Termination extends mfBaseModel { foreach($item_names as $name) { //$this->log->debug(__FILE__.": (Termination ".$this->id.") $name => $type == '".$this->getWorkflowvalue($name)."' (ist: '".$this->getWorkflowvalue("ist_".$name)."')"); - if(empty($this->getWorkflowvalue($name)) && empty($this->getWorkflowvalue("ist_".$name))) { + if(!strlen($this->getWorkflowvalue($name)) && !strlen($this->getWorkflowvalue("ist_".$name))) { $done = false; break; } @@ -352,4 +352,4 @@ class Termination extends mfBaseModel { return $this->$name; } -} \ No newline at end of file +}