From ccdbee221be726e07f319a86910bea9dfda7769d Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 13 Apr 2011 21:56:28 +0000
Subject: [PATCH] NIHVIVO-2481 Fix possible source of NullPointerException
 (still haven't been able to reproduce)

---
 .../individual/PropertyTemplateModel.java          | 14 +++++++++++---
 .../body/partials/individual/lib-properties.ftl    |  2 +-
 2 files changed, 12 insertions(+), 4 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 6d3987295..2d0b01e07 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
@@ -9,6 +9,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -62,10 +63,17 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         }
         
         verboseDisplay = new HashMap<String, Object>();
-        verboseDisplay.put("displayLevel", property.getHiddenFromDisplayBelowRoleLevel().getLabel());
-        verboseDisplay.put("updateLevel", property.getProhibitedFromUpdateBelowRoleLevel().getLabel());   
+        
+        RoleLevel roleLevel = property.getHiddenFromDisplayBelowRoleLevel();
+        String roleLevelLabel = roleLevel != null ? roleLevel.getLabel() : "";
+        verboseDisplay.put("displayLevel", roleLevelLabel);
+
+        roleLevel = property.getHiddenFromDisplayBelowRoleLevel();
+        roleLevelLabel = roleLevel != null ? roleLevel.getLabel() : "";
+        verboseDisplay.put("updateLevel", roleLevelLabel);   
+        
         verboseDisplay.put("localName", property.getLocalNameWithPrefix());
-        verboseDisplay.put("displayTier", getPropertyDisplayTier(property));
+        verboseDisplay.put("displayRank", getPropertyDisplayTier(property));
         
         UrlBuilder urlBuilder = new UrlBuilder(vreq.getPortal());
         String editUrl = urlBuilder.getPortalUrl(getPropertyEditRoute(), "uri", property.getURI());
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 6f291eac8..5f84cdf4c 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -156,7 +156,7 @@ name will be used as the label. -->
         <section class="verbosePropertyListing">
             <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}">${verboseDisplay.localName}</a> 
             (<span>${property.type?lower_case}</span> property);
-            order in group: <span>${verboseDisplay.displayTier};</span> 
+            order in group: <span>${verboseDisplay.displayRank};</span> 
             display level: <span>${verboseDisplay.displayLevel};</span>
             update level: <span>${verboseDisplay.updateLevel}</span>
         </section>