From d53c2c22cc5a8546564d52489d7ee427c4c70b48 Mon Sep 17 00:00:00 2001 From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch> Date: Mon, 24 Jul 2023 12:37:59 +0200 Subject: [PATCH] implment output of project errors --- public_html/deployment/classes/projectlist.class.php | 5 +++++ public_html/deployment/pages/act_setup.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php index c3629eeb..3819504c 100644 --- a/public_html/deployment/classes/projectlist.class.php +++ b/public_html/deployment/classes/projectlist.class.php @@ -75,6 +75,8 @@ class projectlist extends base{ $sDivInprogress='<div class="progressinprogress" title="'.t("progress-inprogress").'">'.$oHtml->getIcon('refresh').t("progress-inprogress").'</div>'; $sDivHasqueue='<div class="progresshasqueue" title="'.t("progress-hasqueue").'">'.$oHtml->getIcon('waiting').t("progress-hasqueue").'</div>'; + $sErrors=''; + // foreach (array_keys($this->_aPhases) as $sPhase) { foreach (array_keys($oPrj1->getPhases()) as $sPhase) { $sPhaseFilter.='<option value="' . $sPhase . '" >' . $sPhase . '</option>'; @@ -132,6 +134,8 @@ class projectlist extends base{ } + $sErrors.=$oPrj->renderErrorBoxes(); + $sOut2 .= '<div class="' . $sClasses . ' prjbox"><div class="title">' .$oHtml->getLink(array( 'href'=>'#', @@ -534,6 +538,7 @@ class projectlist extends base{ </div> <br> + '.$sErrors.' <div class="view viewsimple"> ' . $sOut2 . ' diff --git a/public_html/deployment/pages/act_setup.php b/public_html/deployment/pages/act_setup.php index 8d9f8f4c..ddee0847 100644 --- a/public_html/deployment/pages/act_setup.php +++ b/public_html/deployment/pages/act_setup.php @@ -345,8 +345,8 @@ if ($aParams["prj"] == "all") { $sOut.=$oHtml->getBox("error", t("page-setup-error-settings-were-not-saved")); } } - - $sOut.=$oPrj->renderProjectSetup(); + $sErrors=$oPrj->renderErrorBoxes(); + $sOut.= $sErrors ? $oPrj->renderErrorBoxes() : $oPrj->renderProjectSetup(); } $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; -- GitLab