composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Setup: Fix graphiz detection feedback message on Windows systems

Browse Source
This commit is contained in:
Molkobain
2020-01-21 15:50:33 +01:00
parent 165fd0e700
commit 6e754d4fa5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup/wizardsteps.class.inc.php
View File

@@ -1062,7 +1062,8 @@ EOF
{ {
case CheckResult::INFO: case CheckResult::INFO:
$sStatus = 'ok'; $sStatus = 'ok';
$sMessage = json_encode('<div class="message message-valid">'.$oCheck->sLabel.'</div>'); $sInfoExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Graphviz\' dot found';
$sMessage = json_encode('<div class="message message-valid">'.$sInfoExplanation.'</div>');
break; break;
@@ -1070,7 +1071,8 @@ EOF
case CheckResult::ERROR: case CheckResult::ERROR:
case CheckResult::WARNING: case CheckResult::WARNING:
$sStatus = 'ko'; $sStatus = 'ko';
$sMessage = json_encode('<div class="message message-error">'.$oCheck->sLabel.'</div>'); $sErrorExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Could not find Graphviz\' dot';
$sMessage = json_encode('<div class="message message-error">'.$sErrorExplanation.'</div>');
} }
$oPage->add_ready_script( $oPage->add_ready_script(
@@ -1189,7 +1191,8 @@ EOF
{ {
case CheckResult::INFO: case CheckResult::INFO:
$sStatus = 'ok'; $sStatus = 'ok';
$sMessage = json_encode('<div class="message message-valid">'.$oCheck->sLabel.'</div>'); $sInfoExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Graphviz\' dot found';
$sMessage = json_encode('<div class="message message-valid">'.$sInfoExplanation.'</div>');
break; break;
@@ -1197,7 +1200,8 @@ EOF
case CheckResult::ERROR: case CheckResult::ERROR:
case CheckResult::WARNING: case CheckResult::WARNING:
$sStatus = 'ko'; $sStatus = 'ko';
$sMessage = json_encode('<div class="message message-error">'.$oCheck->sLabel.'</div>'); $sErrorExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Could not find Graphviz\' dot';
$sMessage = json_encode('<div class="message message-error">'.$sErrorExplanation.'</div>');
} }
$oPage->add_ready_script( $oPage->add_ready_script(