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

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.

Browse source
This commit is contained in:
j2blake 2012-09-25 20:35:32 +00:00
parent 88e44af429
commit eb1d4b9631
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/web/templates/freemarker/body/admin/searchIndex.ftl
View file

@ -17,6 +17,9 @@
Reset the search index and re-populate it. Reset the search index and re-populate it.
</p> </p>
</form> </form>
<#elseif totalToDo == 0>
<h3>Preparing to rebuild the search index. </h3>
<p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}</p>
<#else> <#else>
<h3>The search index is currently being ${currentTask}.</h3> <h3>The search index is currently being ${currentTask}.</h3>
<p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}, estimated total time ${expected}</p> <p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}, estimated total time ${expected}</p>