From 464a89ecaa6403ba24e3cc4a8c45c70b19b4feeb Mon Sep 17 00:00:00 2001 From: ryounes Date: Thu, 7 Jul 2011 14:30:40 +0000 Subject: [PATCH] NIHVIVO-2821 For now, suppress verbose property display on vitro and vitro public namespace properties. --- .../templatemodels/individual/PropertyTemplateModel.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java index 7c1319629..00a83c8d8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java @@ -16,6 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; +import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; /** @@ -46,12 +47,15 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel { } protected void setVerboseDisplayValues(Property property) { - // No verbose display for these properties. + + // No verbose display for vitro and vitro public properties. // This models previous behavior. In theory the verbose display can be provided, but we may not want // to give anyone access to these properties, since the application is dependent on them. - if (GroupedPropertyList.VITRO_PROPS_TO_ADD_TO_LIST.contains(property)) { + String namespace = property.getNamespace(); + if (VitroVocabulary.vitroURI.equals(namespace) || VitroVocabulary.VITRO_PUBLIC.equals(namespace)) { return; } + Boolean verboseDisplayValue = (Boolean) vreq.getSession().getAttribute("verbosePropertyDisplay"); if ( ! Boolean.TRUE.equals(verboseDisplayValue)) { return;