NIHVIVO-2118 correction to remove garbage from display page of merge individuals

This commit is contained in:
ass92 2011-02-11 16:29:44 +00:00
parent 13f6b66f6f
commit 1892e4614e

View file

@ -6,21 +6,13 @@
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Merge Individuals</h2>
<form action="ingest" method="get">
<input type="hidden" name="action" value="mergeResult"/>
<%String result = (String) request.getAttribute("result");%>
<%Model leftoverModel = (Model) request.getSession().getAttribute("leftoverModel");
request.getSession().setAttribute("leftoverModel",leftoverModel);%>
<p><b><%=result%></b></p>
<input type="hidden" name="model" value="<%=leftoverModel%>"></input>
<%if(!result.equals("resource 1 not present") && !result.equals("resource 2 not present")){
if(!result.equals("No statements merged") && !result.endsWith("statements.")){%>
<TR>
<br>
<p>Download non-mergeable statements.</p>
<p><input class="submit" type="submit" name="Download" value="Download" ></input></p>
<br>
</TR>
<%}} %>
</form>
<p>Download non-mergeable statements.</p>
<form action="ingest" method="get">
<input type="hidden" name="action" value="mergeResult"/>
<input class="submit" type="submit" name="Download" value="Download" ></input>
</form>
<%}} %>