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

VIVO-869 The display should not barf if no IndexHistory is present.

Browse source
This commit is contained in:
Jim Blake 2015-01-20 16:09:53 -05:00
parent 83a5523ace
commit fcfd2e7be6
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
View file

@ -144,7 +144,8 @@ public class IndexController extends FreemarkerHttpServlet {
throws IOException { throws IOException {
if (!PolicyHelper.isAuthorizedForActions(req, REQUIRED_ACTIONS)) { if (!PolicyHelper.isAuthorizedForActions(req, REQUIRED_ACTIONS)) {
resp.setStatus(HttpServletResponse.SC_FORBIDDEN); resp.setStatus(HttpServletResponse.SC_FORBIDDEN);
resp.getWriter().write("You are not authorized to access this page."); resp.getWriter().write(
"You are not authorized to access this page.");
return; return;
} }
@ -154,7 +155,9 @@ public class IndexController extends FreemarkerHttpServlet {
body.put("rebuildUrl", body.put("rebuildUrl",
UrlBuilder.getUrl(PAGE_URL, "rebuild", "true")); UrlBuilder.getUrl(PAGE_URL, "rebuild", "true"));
body.put("status", buildStatusMap(indexer.getStatus())); body.put("status", buildStatusMap(indexer.getStatus()));
body.put("history", history.toMaps()); if (history != null) {
body.put("history", history.toMaps());
}
String rendered = FreemarkerProcessingServiceSetup.getService( String rendered = FreemarkerProcessingServiceSetup.getService(
getServletContext()).renderTemplate(STATUS_TEMPLATE_NAME, getServletContext()).renderTemplate(STATUS_TEMPLATE_NAME,

10
webapp/web/templates/freemarker/body/admin/searchIndexStatus.ftl
View file

@ -40,9 +40,13 @@
<h3>History</h3> <h3>History</h3>
<table class="history"> <table class="history">
<tr> <th>Event</th> <th>Status</th> <th>Since</th> <th>Counts</th> </tr> <tr> <th>Event</th> <th>Status</th> <th>Since</th> <th>Counts</th> </tr>
<#list history as ie> <#if history?has_content >
<@showIndexerEvent ie /> <#list history as ie>
</#list> <@showIndexerEvent ie />
</#list>
<#else>
<tr><td colspan="4">Search indexer history is not available.</td></tr>
</#if>
</table> </table>
</section> </section>