From 16d14cb86c103200fe81902eac45d8cedbb0c5af Mon Sep 17 00:00:00 2001 From: jeb228 Date: Mon, 7 Feb 2011 19:06:17 +0000 Subject: [PATCH] Add braces to clarify the logic structure, which was not as apparently intended. --- ...hibitedFromUpdateBelowRoleLevelFilter.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java index 1776ac9b3..670c0d6f4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java @@ -163,13 +163,18 @@ public class ProhibitedFromUpdateBelowRoleLevelFilter extends VitroFiltersImpl { try { ObjectProperty prop = stmt.getProperty(); - if( prop == null ) - prop = wdf.getObjectPropertyDao().getObjectPropertyByURI( stmt.getPropertyURI() ); - if( prop == null ) - if( ! canViewOddItems() ){ return false; } - else - if( sameLevelOrHigher( prop.getProhibitedFromUpdateBelowRoleLevel()) == false) - return false; + if (prop == null) { + prop = wdf.getObjectPropertyDao().getObjectPropertyByURI(stmt.getPropertyURI()); + } + if (prop == null) { + if (!canViewOddItems()) { + return false; + } + } else { + if (sameLevelOrHigher(prop.getProhibitedFromUpdateBelowRoleLevel()) == false) { + return false; + } + } Individual subject = (stmt.getSubject() != null ? stmt.getSubject() : wdf.getIndividualDao().getIndividualByURI( stmt.getSubjectURI()));