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

NIHVIVO-3345 test "cause" properly to eliminate extraneous bullets ("cause" might be an empty string). Show the application name in "____ detected a fatal error" instead of hardcoded VIVO. Restore the "Continue" link if only warnings are present.

Browse source
This commit is contained in:
j2blake 2011-11-22 22:10:46 +00:00
parent e868d4a65f
commit d4adfa2210
4 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
View file

@ -29,7 +29,7 @@
<ul class="item-spec" role="navigation">
<li role="listitem">${item.message}</li>
<li role="listitem">${item.sourceName}</li>
<#if item.cause??>
<#if item.cause?has_content>
<li role="listitem"><pre>${item.cause}</pre></li>
</#if>
</ul>
@ -79,7 +79,7 @@
<#if status.errorItems?has_content>
<h2>Fatal error</h2>
<p>VIVO detected a fatal error during startup.</p>
<p>${applicationName} detected a fatal error during startup.</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.errorItems as item>
@ -91,12 +91,18 @@
<#if status.warningItems?has_content>
<h2>Warning</h2>
<p>VIVO issued warnings during startup.</p>
<p>${applicationName} issued warnings during startup.</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
<@statusItem item=item />
</#list>
</ul>
<#-- If there were no fatal errors, let them go forward from here. -->
<#if showLink>
<p><a href=".">Continue</a></p>
</#if>
</#if>
<h2>Startup trace</h2>