From 06bdb86f8aafe0bd534bd6f02ca2ae9914d999d0 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 14 Oct 2013 11:49:21 -0400 Subject: [PATCH] fixes bug in display hiding for qualified properties --- .../webapp/auth/permissions/DisplayByRolePermission.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java index 74917860b..74ff5c584 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java @@ -15,6 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObje import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -112,11 +113,12 @@ public class DisplayByRolePermission extends Permission { */ private boolean isAuthorized(DisplayObjectPropertyStatement action) { ObjectPropertyStatement stmt = action.getObjectPropertyStatement(); - String subjectUri = stmt.getSubjectURI(); - String predicateUri = stmt.getPropertyURI(); + String subjectUri = stmt.getSubjectURI(); String objectUri = stmt.getObjectURI(); + Property op = (stmt.getProperty() != null) + ? stmt.getProperty() : new Property(stmt.getPropertyURI()); return canDisplayResource(subjectUri) - && canDisplayPredicate(new Property(predicateUri)) + && canDisplayPredicate(op) && canDisplayResource(objectUri); }