litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated to check for null variables

Browse source
This commit is contained in:
tworrall 2012-02-06 20:26:42 +00:00
parent 8bbd0b740f
commit 3053023f9e
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webapp/web/templates/freemarker/body/error/error-email.ftl
View file

@ -9,29 +9,31 @@
<#assign html>
<html>
<head>
<title>${subject}</title>
<title>${subject!}</title>
</head>
<body>
<p>
An error occurred on your VIVO site at ${datetime}.
An error occurred on your VIVO site at ${datetime!}.
</p>
<p>
<strong>Requested url:</strong> ${requestedUrl}
<strong>Requested url:</strong> ${requestedUrl!}
</p>
<p>
<strong>Error message:</strong> ${errorMessage}
<#if errorMessage?has_content>
<strong>Error message:</strong> ${errorMessage!}
</#if>
</p>
<p>
<strong>Stack trace</strong> (full trace available in the vivo log):
<pre>${stackTrace}</pre>
<pre>${stackTrace!}</pre>
</p>
<#if cause?has_content>
<p><strong>Caused by:</strong>
<pre>${cause}</pre>
<pre>${cause!}</pre>
</p>
</#if>
@ -40,18 +42,20 @@
</#assign>
<#assign text>
An error occurred on your VIVO site at ${datetime}.
An error occurred on your VIVO site at ${datetime!}.
Requested url: ${requestedUrl}
Requested url: ${requestedUrl!}
Error message: ${errorMessage}
<#if errorMessage?has_content>
Error message: ${errorMessage!}
</#if>
Stack trace (full trace available in the vivo log):
${stackTrace}
${stackTrace!}
<#if cause?has_content>
Caused by:
${cause}
${cause!}
</#if>
</#assign>