From eb1d4b9631812ec5b72f00ae1a7d380e86253dc4 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 25 Sep 2012 20:35:32 +0000 Subject: [PATCH] Merge from branch: NIHVIVO-3930 Add logic to the template: if totalToDo is 0, we are still preparing the list of records to index. Don't show the counts, or an estimated time. --- webapp/web/templates/freemarker/body/admin/searchIndex.ftl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapp/web/templates/freemarker/body/admin/searchIndex.ftl b/webapp/web/templates/freemarker/body/admin/searchIndex.ftl index 372c89cc9..fb5a94b7c 100644 --- a/webapp/web/templates/freemarker/body/admin/searchIndex.ftl +++ b/webapp/web/templates/freemarker/body/admin/searchIndex.ftl @@ -17,6 +17,9 @@ Reset the search index and re-populate it.

+<#elseif totalToDo == 0> +

Preparing to rebuild the search index.

+

since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}

<#else>

The search index is currently being ${currentTask}.

since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}, estimated total time ${expected}