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

N°3522 Handle twig errors nicely for AJAX calls

Browse Source 
Whereas when called directly we are throwing an exception, in a Ajax context we are printing the error message and logging
This commit is contained in:
Pierre Goiffon
2021-03-15 14:40:55 +01:00
parent 8dd96ea636
commit 8b47536835
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/application/TwigBase/Twig/TwigHelper.php
View File

@@ -7,6 +7,8 @@
namespace Combodo\iTop\Application\TwigBase\Twig;
use Combodo\iTop\Application\TwigBase\UI\UIBlockExtension;
use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
use Combodo\iTop\Renderer\BlockRenderer;
use CoreTemplateException;
use IssueLog;
use Twig\Environment;
@@ -134,9 +136,19 @@ class TwigHelper
}
if (strpos($oTwigException->getMessage(), 'Unable to find template') === false) {
//TODO handle ajax ??
// this will trigger error page, and will log to error.log !
throw new CoreTemplateException($oTwigException, $sPath);
if (utils::IsXmlHttpRequest()) {
// Ajax : just return the error message as part of the DOM
$oAlert = AlertUIBlockFactory::MakeForFailure($sPath, $oTwigException->getMessage())
->SetIsClosable(false)
->SetIsCollapsible(false); // not rendering JS so...
IssueLog::Error($sPath.$oTwigException->getMessage());
return BlockRenderer::RenderBlockTemplates($oAlert);
} else {
// this will trigger error page, and will log to error.log !
throw new CoreTemplateException($oTwigException, $sPath);
}
}
if ($bLogMissingFile) {