From 2df39c9e24d99c66c2975479bd7ddb6beb8aa614 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 25 Nov 2013 10:42:32 -0500 Subject: [PATCH] change to PropertyGroupTemplateModel to prevent drawing meaningless headers when a DataProperty is not visible or editable --- .../individual/PropertyGroupTemplateModel.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java index b50469188..91d463f54 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java @@ -9,6 +9,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; @@ -50,8 +51,15 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel { properties.add(tm); } + } else if (p instanceof DataProperty){ + DataProperty dp = (DataProperty) p; + RequestedAction dop = new DisplayDataProperty(dp); + if (!PolicyHelper.isAuthorizedForActions(vreq, dop)) { + continue; + } + properties.add(new DataPropertyTemplateModel(dp, subject, vreq, editing, populatedDataPropertyList)); } else { - properties.add(new DataPropertyTemplateModel((DataProperty)p, subject, vreq, editing, populatedDataPropertyList)); + log.debug(p.getURI() + " is neither an ObjectProperty nor a DataProperty; skipping display"); } } }