diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php index 7e04996f009d1cfbbcf439e1e1a455671d2daaa5..f7176c8aab66bbf5df4c0fc051877e8a7216bb84 100644 --- a/public_html/deployment/classes/actionlog.class.php +++ b/public_html/deployment/classes/actionlog.class.php @@ -281,7 +281,11 @@ class Actionlog { <div id="tableLogactions"></div> </div>'; - if (!$bIsFullsearch){ + if ($bIsFullsearch){ + $sReturn.='<script>$(document).ready(function() { + updateActionlog(); + });</script>'; + } else { $sReturn= '<strong>' . '<button onclick="setLogVisibility(\'block\');" id="btnShowLogs" class="btnLogs"><b class="icon-chevron-right"></b> </button>' diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 493fdd66258b5ad1c7da534a1d53a588c05bd02a..ff99cabfba82cc6c990723ebb5b287ea3af8b634 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -750,7 +750,7 @@ class project { /** * check: is the deployment to the next phase enabled for this phase? - * @param type $sPhase + * @param type $sPhase current phase */ public function canAcceptPhase($sPhase = false) { @@ -777,9 +777,9 @@ class project { // array key "ok" must be in the ready2install and deployed info if ( array_key_exists($sPhase, $this->_aData["phases"]) && array_key_exists("onhold", $this->_aData["phases"][$sPhase]) && array_key_exists("ready2install", $this->_aData["phases"][$sPhase]) && array_key_exists("deployed", $this->_aData["phases"][$sPhase]) && array_key_exists("ok", $this->_aData["phases"][$sPhase]["onhold"]) && array_key_exists("ok", $this->_aData["phases"][$sPhase]["ready2install"]) && array_key_exists("ok", $this->_aData["phases"][$sPhase]["deployed"]) - ) + ){ return true; - + } return false; } @@ -810,6 +810,10 @@ class project { return $this->_aData["phases"]["source"]; } + /** + * init version control system (git, ...) + * @return vcs-object + */ private function _initVcs(){ if (!$this->_oVcs) { if (!$this->_aPrjConfig["build"]["type"]){ @@ -2137,6 +2141,8 @@ class project { $aRepodata = $this->getRepoRevision(); if (array_key_exists("revision", $aRepodata)) { $sRepoBar=$this->_getChecksumDiv($aRepodata["revision"]); + } else { + $sRepoBar='<span class="error">' . t("error") . '</span>'; } $sPackagebar=''; diff --git a/public_html/deployment/js/functions.js b/public_html/deployment/js/functions.js index 486ee5ddc9c81b8a4f59a0cefd394d3301c8a582..22560c73e07121f0cab2966a5f1225c671d3dec3 100644 --- a/public_html/deployment/js/functions.js +++ b/public_html/deployment/js/functions.js @@ -87,7 +87,7 @@ function updateActionlog(){ sHead+='<th>'+aTableitems[j]+'</th>'; } sHead='<thead><tr>'+sHead+'</tr></thead>'; - sHtml='<table class="table">'+sHead+'<tbody>'+sHtml+'</tbody></table>'; + sHtml='<table class="table table-condensed">'+sHead+'<tbody>'+sHtml+'</tbody></table>'; } $('#tableLogactions').html(sHtml); filterLogTable();