From c08ac9eda056898e7b3b1e0f40ed8d5b751c7e43 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Thu, 13 Mar 2014 12:16:09 -0400
Subject: [PATCH] VIVO-682 BETTER Fix display of self-editor level properties

Need to test for the property itself as well, because the property statement tests don't allow for faux properties.
Of course this means that a self-editing faux property will not be shown if its parent property is hidden.
---
 .../PropertyGroupTemplateModel.java           | 63 ++++++++++++++-----
 1 file changed, 48 insertions(+), 15 deletions(-)

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 db1b2343c..46921a967 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
@@ -12,7 +12,9 @@ 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.DisplayDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
@@ -44,16 +46,11 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
         
         List<Property> propertyList = group.getPropertyList();
         properties = new ArrayList<PropertyTemplateModel>(propertyList.size());
+        
         for (Property p : propertyList)  {
             if (p instanceof ObjectProperty) {
                 ObjectProperty op = (ObjectProperty) p;
-                ObjectPropertyStatement ops = new ObjectPropertyStatementImpl(subject.getURI(), op.getURI(), SOME_URI);
-				RequestedAction dops = new DisplayObjectPropertyStatement(ops);
-				/*
-				 * We can't test the ObjectProperty itself for authorization;
-				 * the self-editor policies need to know who the subject is.
-				 */
-                if (!PolicyHelper.isAuthorizedForActions(vreq, dops)) {
+                if (!allowedToDisplay(vreq, op, subject)) {
                     continue;
                 }
                 ObjectPropertyTemplateModel tm = ObjectPropertyTemplateModel.getObjectPropertyTemplateModel(
@@ -64,13 +61,7 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 
             } else if (p instanceof DataProperty){
                 DataProperty dp = (DataProperty) p;
-                DataPropertyStatementImpl dps = new DataPropertyStatementImpl(subject.getURI(), dp.getURI(), SOME_LITERAL);
-				RequestedAction dops = new DisplayDataPropertyStatement(dps);
-				/*
-				 * We can't test the DataProperty itself for authorization; the
-				 * self-editor policies need to know who the subject is.
-				 */
-                if (!PolicyHelper.isAuthorizedForActions(vreq, dops)) {
+                if (!allowedToDisplay(vreq, dp, subject))  {
                     continue;
                 }
                 properties.add(new DataPropertyTemplateModel(dp, subject, vreq, editing, populatedDataPropertyList));
@@ -80,7 +71,49 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
         }
     }
 
-    protected boolean isEmpty() {
+	/**
+	 * See if the property is permitted in its own right. If not, the property
+	 * statement might still be permitted to a self-editor.
+	 */
+	private boolean allowedToDisplay(VitroRequest vreq, ObjectProperty op,
+			Individual subject) {
+		RequestedAction dop = new DisplayObjectProperty(op);
+		if (PolicyHelper.isAuthorizedForActions(vreq, dop)) {
+			return true;
+		}
+	
+		ObjectPropertyStatement ops = new ObjectPropertyStatementImpl(
+				subject.getURI(), op.getURI(), SOME_URI);
+		RequestedAction dops = new DisplayObjectPropertyStatement(ops);
+		if (PolicyHelper.isAuthorizedForActions(vreq, dops)) {
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * See if the property is permitted in its own right. If not, the property
+	 * statement might still be permitted to a self-editor.
+	 */
+	private boolean allowedToDisplay(VitroRequest vreq, DataProperty dp,
+			Individual subject) {
+		RequestedAction dop = new DisplayDataProperty(dp);
+		if (PolicyHelper.isAuthorizedForActions(vreq, dop)) {
+			return true;
+		}
+
+		DataPropertyStatementImpl dps = new DataPropertyStatementImpl(
+				subject.getURI(), dp.getURI(), SOME_LITERAL);
+		RequestedAction dops = new DisplayDataPropertyStatement(dps);
+		if (PolicyHelper.isAuthorizedForActions(vreq, dops)) {
+			return true;
+		}
+	
+		return false;
+	}
+
+	protected boolean isEmpty() {
         return properties.isEmpty();
     }