litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2481 Fix possible source of NullPointerException (still haven't been able to reproduce)

Browse source
This commit is contained in:
ryounes 2011-04-13 21:56:28 +00:00
parent 233c1c8feb
commit ccdbee221b
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
View file

@ -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());

2
webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
View file

@ -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>