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

enable type dropdown to have subclasses for new individual page,prevent template errors if no addurl for property, show edit link if only one label and no locales

Browse source
This commit is contained in:
hudajkhan 2013-11-19 13:24:50 -05:00
parent 35251e89f4
commit d5fa8b0613
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -548,7 +548,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
} }
for(VClass rangeVClass : rangeVClasses) { for(VClass rangeVClass : rangeVClasses) {
vclasses.add(rangeVClass); vclasses.add(rangeVClass);
List<String> subURIs = wdf.getVClassDao().getSubClassURIs(rangeVClass.getURI()); List<String> subURIs = wdf.getVClassDao().getAllSubClassURIs(rangeVClass.getURI());
for (String subClassURI : subURIs) { for (String subClassURI : subURIs) {
VClass subClass = wdf.getVClassDao().getVClassByURI(subClassURI); VClass subClass = wdf.getVClassDao().getVClassByURI(subClassURI);
if (subClass != null) { if (subClass != null) {

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

@ -118,7 +118,7 @@ name will be used as the label. -->
</#if> </#if>
--> -->
<#if editable> <#if editable>
<h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2> <h2 id="${property.localName!}">${label} ${addLink!} ${verboseDisplay!}</h2>
</#if> </#if>
</#macro> </#macro>
@ -134,8 +134,8 @@ name will be used as the label. -->
<#local domainUri = "" /> <#local domainUri = "" />
</#if> </#if>
<#if editable> <#if editable>
<#local url = property.addUrl> <#if property.addUrl?has_content>
<#if url?has_content> <#local url = property.addUrl>
<@showAddLink property.localName label url rangeUri domainUri/> <@showAddLink property.localName label url rangeUri domainUri/>
</#if> </#if>
</#if> </#if>
@ -274,7 +274,8 @@ name will be used as the label. -->
<#assign labelPropertyUri = ("http://www.w3.org/2000/01/rdf-schema#label"?url) /> <#assign labelPropertyUri = ("http://www.w3.org/2000/01/rdf-schema#label"?url) />
<#assign useEditLink = false /> <#assign useEditLink = false />
<#--edit link used if in edit mode and only one label and one language--> <#--edit link used if in edit mode and only one label and one language-->
<#if labelCount = 1 && editable && localesCount = 1 > <#--locales count may be 0 in case where no languages/selectable locales are specified-->
<#if labelCount = 1 && editable && (localesCount >= 0) >
<#assign useEditLink = true/> <#assign useEditLink = true/>
</#if> </#if>
<#local label = individual.nameStatement> <#local label = individual.nameStatement>