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°3537 run_query : use panel for OQL error

Browse Source
This commit is contained in:
Pierre Goiffon
2020-12-22 17:31:08 +01:00
parent 5e22c442ce
commit 337aebfed9
16 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pages/run_query.php
View File

@@ -292,37 +292,40 @@ EOF
$oMoreInfoSection = new CollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), $aMoreInfoBlocks);
$oP->AddUiBlock($oMoreInfoSection);
}
elseif ($sSyntaxError)
{
if ($e instanceof OqlException)
{
} elseif ($sSyntaxError) {
if ($e instanceof OqlException) {
$sWrongWord = $e->GetWrongWord();
$aSuggestedWords = $e->GetSuggestions();
if (is_array($aSuggestedWords) && count($aSuggestedWords) > 0)
{
if (is_array($aSuggestedWords) && count($aSuggestedWords) > 0) {
$sSuggestedWord = OqlException::FindClosestString($sWrongWord, $aSuggestedWords);
if (strlen($sSuggestedWord) > 0)
{
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->GetIssue().' <em>'.$sWrongWord).'</em></b>');
if (strlen($sSuggestedWord) > 0) {
$sSyntaxErrorText = $e->GetIssue().'<br><em>'.$sWrongWord.'</em>';
$sBefore = substr($sExpression, 0, $e->GetColumn());
$sAfter = substr($sExpression, $e->GetColumn() + strlen($sWrongWord));
$sFixedExpression = $sBefore.$sSuggestedWord.$sAfter;
$sFixedExpressionHtml = $sBefore.'<span style="background-color:yellow">'.$sSuggestedWord.'</span>'.$sAfter;
$oP->p("Suggesting: $sFixedExpressionHtml");
$oP->add('<button onClick="$(\'textarea[name=expression]\').val(\''.htmlentities(addslashes($sFixedExpression)).'\');">Use this query</button>');
}
else
{
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
$sSyntaxErrorText .= $oP->GetP("Suggesting: $sFixedExpressionHtml");
$sEscapedExpression = utils::HtmlEntities(addslashes($sFixedExpression));
$sSyntaxErrorText .= $oP->GetP(<<<HTML
<button onClick="$('textarea[name=expression]')
.val('$sEscapedExpression')
.focus();">Use this query</button>
HTML
);
} else {
$sSyntaxErrorText = $oP->GetP($e->getHtmlDesc());
}
} else {
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
$sSyntaxErrorText = $oP->GetP($e->getHtmlDesc());
}
} else {
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
$sSyntaxErrorText = $oP->GetP($e->getMessage());
}
$oSyntaxErrorPanel = AlertFactory::MakeForFailure(Dict::S('UI:RunQuery:Error'), $sSyntaxErrorText);
$oSyntaxErrorPanel->SetOpenedByDefault(true);
$oP->AddUiBlock($oSyntaxErrorPanel);
}
}
catch (Exception $e) {