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

updates for NIHVIVO-3517 "Template exception thrown when deleting either hasEditorRole or hasReviewerRole properties". Updated EditConfigurationTemplateModel to return ObjectPropertyTemplateModel representing property and Freemarker template to assign that object to the variable "property" so the list view for reviewer/editor would work correctly.

Browse source
This commit is contained in:
hjkhjk54 2011-12-16 19:31:49 +00:00
parent 555d32bb91
commit 4de612a306
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -40,6 +40,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyStatementTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyStatementTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.EditingPolicyHelper; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.EditingPolicyHelper;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyStatementTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyStatementTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.PropertyStatementTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.PropertyStatementTemplateModel;
import freemarker.ext.beans.BeansWrapper; import freemarker.ext.beans.BeansWrapper;
import freemarker.template.DefaultObjectWrapper; import freemarker.template.DefaultObjectWrapper;
@ -457,13 +458,18 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
null, null, vreq); null, null, vreq);
ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper(); ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper();
return wrapper.wrap(osm); return wrapper.wrap(osm);
/* TemplateModel tm = null; }
try {
tm = wrapper.wrap(osm); //HasEditor and HasReviewer Roles also expect the Property template model to be passed
} catch(Exception ex) { public TemplateModel getObjectPropertyStatementDisplayPropertyModel() throws TemplateModelException {
log.error("Error occurred in wrapping object property statement model", ex); Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
} ObjectProperty op = EditConfigurationUtils.getObjectProperty(vreq);
return tm;*/ List<ObjectProperty> propList = new ArrayList<ObjectProperty>();
propList.add(op);
EditingPolicyHelper policyHelper = new EditingPolicyHelper(vreq);
ObjectPropertyTemplateModel otm = ObjectPropertyTemplateModel.getObjectPropertyTemplateModel(op, subject, vreq, policyHelper,propList);
ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper();
return wrapper.wrap(otm);
} }
public String getDataStatementDisplay() { public String getDataStatementDisplay() {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java
View file

@ -20,7 +20,7 @@ public class EditingPolicyHelper {
private final PolicyIface policy; private final PolicyIface policy;
private final IdentifierBundle ids; private final IdentifierBundle ids;
protected EditingPolicyHelper(VitroRequest vreq) { public EditingPolicyHelper(VitroRequest vreq) {
this.policy = RequestPolicyList.getPolicies(vreq); this.policy = RequestPolicyList.getPolicies(vreq);
this.ids = RequestIdentifiers.getIdBundleForRequest(vreq); this.ids = RequestIdentifiers.getIdBundleForRequest(vreq);
} }

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -208,7 +208,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
return object; return object;
} }
protected static ObjectPropertyTemplateModel getObjectPropertyTemplateModel(ObjectProperty op, public static ObjectPropertyTemplateModel getObjectPropertyTemplateModel(ObjectProperty op,
Individual subject, VitroRequest vreq, EditingPolicyHelper policyHelper, Individual subject, VitroRequest vreq, EditingPolicyHelper policyHelper,
List<ObjectProperty> populatedObjectPropertyList) { List<ObjectProperty> populatedObjectPropertyList) {

2
webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
View file

@ -6,6 +6,8 @@
<#assign toBeDeletedClass = "objProp" /> <#assign toBeDeletedClass = "objProp" />
<#if editConfiguration.objectStatementDisplay?has_content> <#if editConfiguration.objectStatementDisplay?has_content>
<#assign statement = editConfiguration.objectStatementDisplay /> <#assign statement = editConfiguration.objectStatementDisplay />
<#--Reviewer and editor role list views required object property template model object for property-->
<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
</#if> </#if>
<#else> <#else>
<#assign statement = editConfiguration.dataStatementDisplay /> <#assign statement = editConfiguration.dataStatementDisplay />