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

NIHVIVO-2309 Fix propStatement-educationalTraining.ftl to handle coming from propDelete, where individual is not defined in the data model

Browse source
This commit is contained in:
ryounes 2011-03-24 21:22:24 +00:00
parent 6b7c12d3a3
commit 4f003dc668
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -127,7 +127,7 @@ public class IndividualController extends FreemarkerHttpServlet {
body.put("temporalVisualizationEnabled", getTemporalVisualizationFlag());
body.put("verbosePropertySwitch", getVerbosePropertyValues(vreq));
IndividualTemplateModel itm = getIndividualTemplateModel(vreq, individual);
IndividualTemplateModel itm = getIndividualTemplateModel(individual, vreq);
/* We need to expose non-getters in displaying the individual's property list,
* since it requires calls to methods with parameters.
* This is still safe, because we are only putting BaseTemplateModel objects
@ -248,7 +248,7 @@ public class IndividualController extends FreemarkerHttpServlet {
return linkTag;
}
private IndividualTemplateModel getIndividualTemplateModel(VitroRequest vreq, Individual individual)
private IndividualTemplateModel getIndividualTemplateModel(Individual individual, VitroRequest vreq)
throws ServletException, IOException {
IndividualDao iwDao = vreq.getWebappDaoFactory().getIndividualDao();