Skip to content
Snippets Groups Projects
Commit 75b1ed57 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'projects-in-ldap' into 'master'

task#1390 - CI Webgui: update config

See merge request !19
parents 6ef61262 ac2da0f7
No related branches found
No related tags found
No related merge requests found
...@@ -3011,25 +3011,11 @@ class project extends base { ...@@ -3011,25 +3011,11 @@ class project extends base {
); );
foreach (array_keys($this->getPhases()) as $sPhase) { foreach (array_keys($this->getPhases()) as $sPhase) {
$bActivePhase = $this->isActivePhase($sPhase);
// for migration - take "puppethost":
$sUrl = array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["url"] : "";
$sPuppethost = array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["puppethost"] : "";
$bActivePhase = $sUrl>'';
$bActivePhase = array_key_exists("active", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["active"][0] : $bActivePhase;
$sDeployhosts = array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["puppethost"] : "";
$sDeployhosts = array_key_exists("hosts", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["hosts"] : $sDeployhosts;
$sDeploymethod = $sPuppethost ? "puppet" : "none";
$sDeploymethod = array_key_exists("deploymethod", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploymethod"] : $sDeploymethod;
// TODO:
/*
$bActivePhase = $this->isActivePhase();
$sUrl = array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["url"] : ""; $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"] : ""; $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"] : "none";
*/
$sDeploytimes = array_key_exists("deploytimes", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploytimes"] : ""; $sDeploytimes = array_key_exists("deploytimes", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploytimes"] : "";
$sDivId4PhaseSettings='divSettings'.$sPhase; $sDivId4PhaseSettings='divSettings'.$sPhase;
...@@ -3041,11 +3027,11 @@ class project extends base { ...@@ -3041,11 +3027,11 @@ class project extends base {
// .'<pre>'.print_r($this->_aPrjConfig["phases"][$sPhase], 1).'</pre>' // .'<pre>'.print_r($this->_aPrjConfig["phases"][$sPhase], 1).'</pre>'
. '<a class="'.$sPhase.'">' . '<a class="'.$sPhase.'">'
. t("phase") . ' ' . $sPhase . t("phase") . ' ' . $sPhase
. ($sUrl . $sPuppethost ? '' : ' (' . t("inactive") . ')') . ($bActivePhase ? '' : ' (' . t("inactive") . ')')
. '</a>' . '</a>'
. '<table class="table">' . '<table class="table">'
. '<tbody>' . '<tbody>'
. '<tr><td class="' . ($sUrl . $sPuppethost ? $sPhase : '') . '">' . '<tr><td class="' . ($bActivePhase ? $sPhase : '') . '">'
); );
$aForms["setup"]["form"]['input' . $i++] = array( $aForms["setup"]["form"]['input' . $i++] = array(
...@@ -3153,6 +3139,11 @@ class project extends base { ...@@ -3153,6 +3139,11 @@ class project extends base {
} }
*/ */
$aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup',
'value' => ''
.'</div>'
);
// when to deploy // when to deploy
$aForms["setup"]["form"]['input' . $i++] = array( $aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'text', 'type' => 'text',
...@@ -3167,7 +3158,7 @@ class project extends base { ...@@ -3167,7 +3158,7 @@ class project extends base {
$aForms["setup"]["form"]['input' . $i++] = array( $aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup', 'type' => 'markup',
'value' => '' 'value' => ''
.'</div></div>' .'</div>'
); );
$aForms["setup"]["form"]['input' . $i++] = array( $aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup', 'type' => 'markup',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment