From e5505bb7330fa6b66eb02f73c1e1d45950ea5811 Mon Sep 17 00:00:00 2001 From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch> Date: Fri, 5 May 2017 09:34:43 +0200 Subject: [PATCH] task#1390 - CI Webgui: update config; --- config/lang/de.json | 2 +- config/lang/en.json | 2 +- public_html/deployment/classes/project.class.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/lang/de.json b/config/lang/de.json index 38339280..2456673f 100644 --- a/config/lang/de.json +++ b/config/lang/de.json @@ -191,7 +191,7 @@ "page-login-username": "Benutzername", "page-login-password": "Passwort", - "page-overview-no-phase": "Es wurde noch keine URL in keiner der Phasen definiert", + "page-overview-no-phase": "Es wurde noch keine der Phasen aktiviert.", "page-overview-phase-infos": "Für dieses Projekt sind folgende Phasen konfiguriert:", "page-setup-info": "Einstellungen der Web GUI", diff --git a/config/lang/en.json b/config/lang/en.json index 6aab4dc9..0cdc4aa3 100644 --- a/config/lang/en.json +++ b/config/lang/en.json @@ -192,7 +192,7 @@ "page-login-username": "Username", "page-login-password": "Password", - "page-overview-no-phase": "This project has no active phase. No url was entered to any phase.", + "page-overview-no-phase": "This project has no active phase.", "page-overview-phase-infos": "This project has these phases:", "page-setup-info": "Setup", diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 80dbfac1..90df7470 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -3014,8 +3014,7 @@ class project extends base { $bActivePhase = $this->isActivePhase($sPhase); $sUrl = array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["url"] : ""; $sDeploymethod = array_key_exists("deploymethod", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploymethod"] : ""; - $sDeployhosts = array_key_exists("hosts", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["hosts"] : "none"; - + $sDeployhosts = array_key_exists("hosts", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["hosts"] : ""; $sDeploytimes = array_key_exists("deploytimes", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploytimes"] : ""; $sDivId4PhaseSettings='divSettings'.$sPhase; -- GitLab