From 39293eeb6576bca974fc21a15c969c1894b45106 Mon Sep 17 00:00:00 2001 From: nac26 Date: Thu, 22 Jul 2010 18:06:22 +0000 Subject: [PATCH] merge from rel-1.1-maint branch: Changed the test on objRows so that properties marked with an update level of "nobody" are still rendered NIHVIVO-848 --- productMods/templates/entity/entityMergedPropsList.jsp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/productMods/templates/entity/entityMergedPropsList.jsp b/productMods/templates/entity/entityMergedPropsList.jsp index 330aff5f..e80948fe 100644 --- a/productMods/templates/entity/entityMergedPropsList.jsp +++ b/productMods/templates/entity/entityMergedPropsList.jsp @@ -141,8 +141,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. See NIHVIVO-512. --%> - - + + <%-- nac26 Changing the test on objRows here to be GTE so that properties marked with an update level of "nobody" are still rendered --%> +