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

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source
This commit is contained in:
Molkobain
2021-07-13 11:44:42 +02:00
parent 2f1b5d2736 8e6379a112
commit 4e1db7d7e2
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup/setuputils.class.inc.php
View File

@@ -1469,30 +1469,24 @@ JS
}
}
}
if (count($aErrors) > 0)
{
$sErrorsToDisplay = utils::HtmlEntities(implode('<br/>', $aErrors));
if (count($aErrors) > 0) {
$sErrorsToDisplay = str_replace('\'', '\\\'', implode('<br/>', $aErrors));
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
$oPage->add_ready_script(
<<<JS
<<<JS
$("#db_info").html('<div class="message message-error"><span class="message-title">Error:</span>$sErrorsToDisplay</div>');
JS
);
}
else
{
if (count($aWarnings) > 0)
{
$sWarningsToDisplay = utils::HtmlEntities(implode('<br/>', $aWarnings));
} else {
if (count($aWarnings) > 0) {
$sWarningsToDisplay = str_replace('\'', '\\\'', implode('<br/>', $aWarnings));
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
$oPage->add_ready_script(
<<<JS
$("#db_info").html('<div class="message message-warning"><span class="message-title">Warning:</span>$sWarningsToDisplay</div>');
JS
);
}
else
{
} else {
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
$oPage->add_ready_script(
<<<JS