composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°6016 Setup Wizard : fix MissingDependencyException message logged as html in setup.log

Browse Source 
Was the case since e831d66b (commit for parent bug N°5090)
Now we are getting the text version in the log (and still the html one on screen)

The unattended install isn't concerned : it just prints back CheckResult returned by \SetupUtils::CheckSelectedModules, with the exception text message ($e->getMessage())
This commit is contained in:
Pierre Goiffon
2023-03-06 11:24:46 +01:00
parent 4cea418517
commit d908827787
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup/setuppage.class.inc.php
View File

@@ -62,28 +62,28 @@ class SetupPage extends NiceWebPage
return '';
}
public function info($sText)
public function info($sText, $sTextForLog = null)
{
$this->add("<p class=\"info\">$sText</p>\n");
$this->log_info($sText);
self::log_info($sTextForLog ?? $sText);
}
public function ok($sText)
public function ok($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-valid\"><span class=\"message-title\">Success:</span>$sText</div>");
$this->log_ok($sText);
self::log_ok($sTextForLog ?? $sText);
}
public function warning($sText)
public function warning($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-warning\"><span class=\"message-title\">Warning:</span>$sText</div>");
$this->log_warning($sText);
self::log_warning($sTextForLog ?? $sText);
}
public function error($sText)
public function error($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-error\">$sText</div>");
$this->log_error($sText);
self::log_error($sTextForLog ?? $sText);
}
public function form($aData)

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

@@ -1386,7 +1386,7 @@ class WizStepModulesChoice extends WizardStep
}
catch(MissingDependencyException $e)
{
$oPage->warning($e->getHtmlDesc());
$oPage->warning($e->getHtmlDesc(), $e->getMessage());
}
$this->bUpgrade = ($this->oWizard->GetParameter('install_mode') != 'install');