From 33960db0cfa33231e9c452a9cb9aa69db4dfb6ad Mon Sep 17 00:00:00 2001
From: hahn <axel.hahn@iml.unibe.ch>
Date: Wed, 20 Jul 2022 16:48:45 +0200
Subject: [PATCH] update in progress detection
---
public_html/deployment/classes/project.class.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 2e81ddc6..497eba09 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -868,7 +868,9 @@ class project extends base {
}
/**
* get deploy and queue infos for all phases
- * @return type
+ * It build up a subkey "progress" with info if a build is queued
+ * or an installation of a new package is going on
+ * @return array
*/
public function getAllPhaseInfos() {
@@ -891,8 +893,9 @@ class project extends base {
$aDataPhase = $this->_aData["phases"][$sPhase];
foreach (array_keys($this->getPlaces()) as $sPlace) {
if (
- array_key_exists($sPlace, $aDataPhase)
- && array_key_exists('version', $aDataPhase[$sPlace])
+ $sPlace!=='onhold'
+ && array_key_exists($sPlace, $aDataPhase)
+ // && array_key_exists('version', $aDataPhase[$sPlace])
) {
if($bFirstVersion && !$bHasDifferentVersions && $bFirstVersion!==$aDataPhase[$sPlace]['version']){
$bHasDifferentVersions=true;
--
GitLab