From 5bf80c3e142a5b803a35217ed8c70b2c3937a68b Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 31 May 2013 12:38:17 -0400 Subject: [PATCH] VIVO-118 Make getDataPropertyByURI() an unfiltered operation. This method is used to determine whether a given property is a data property or not. If the user is restricted from displaying this property, then the filtered answer is NO. But that is really inappropriate. The real questions are whether the user can see the values of this property, and whether the user can add or modify values of this property -- not whether the user can see or modify the property itself. --- .../dao/filtering/DataPropertyDaoFiltering.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java index 4e24c39f2..bd3a10c23 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java @@ -95,24 +95,14 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{ @Override public DataProperty getDataPropertyByURI(String dataPropertyURI) { - DataProperty prop = innerDataPropertyDao.getDataPropertyByURI(dataPropertyURI); - if( prop != null ){ - Boolean acceptable = filters.getDataPropertyFilter().fn(prop); - if( acceptable == Boolean.TRUE ) - return prop; - else - return null; - } - return null; + return innerDataPropertyDao.getDataPropertyByURI(dataPropertyURI); } - @Override public String insertDataProperty(DataProperty dataProperty) throws InsertException { return innerDataPropertyDao.insertDataProperty(dataProperty); } - @Override public void updateDataProperty(DataProperty dataProperty) { innerDataPropertyDao.updateDataProperty(dataProperty);