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

VIVO-285: visualization updates for ISF

Browse source
This commit is contained in:
tworrall 2013-09-30 09:29:19 -04:00
parent 4202f30ea7
commit 4d5a567e36
2 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
View file

@ -476,6 +476,19 @@ public class GroupedPropertyList extends BaseTemplateModel {
return null;
}
public PropertyTemplateModel getProperty(String propertyUri, String rangeUri) {
for (PropertyGroupTemplateModel pgtm : groups) {
List<PropertyTemplateModel> properties = pgtm.getProperties();
for (PropertyTemplateModel ptm : properties) {
if (propertyUri.equals(ptm.getUri()) && rangeUri.equals(ptm.getRangeUri())) {
return ptm;
}
}
}
return null;
}
public PropertyTemplateModel pullProperty(String propertyUri) {
return pullProperty(propertyUri, null);
}

18
webapp/web/templates/freemarker/lib/lib-properties.ftl
View file

@ -22,6 +22,24 @@
</#if>
</#function>
<#-- Return true iff there are statements for this property -->
<#function hasVisualizationStatements propertyGroups propertyName rangeUri>
<#local property = propertyGroups.getProperty(propertyName, rangeUri)!>
<#-- First ensure that the property is defined
(an unpopulated property while logged out is undefined) -->
<#if ! property?has_content>
<#return false>
</#if>
<#if property.collatedBySubclass!false> <#-- collated object property-->
<#return property.subclasses?has_content>
<#else>
<#return property.statements?has_content> <#-- data property or uncollated object property -->
</#if>
</#function>
<#-----------------------------------------------------------------------------
Macros for generating property lists