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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-08 17:13:32 -05:00
commit e5195c6105
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -9,7 +9,7 @@
--> -->
<#assign rangeOptionsExist = true /> <#assign rangeOptionsExist = true />
<#assign rangeVClassURI = editConfiguration.objectPredicateProperty.rangeVClassURI!"" />
<#assign objectTypes = editConfiguration.pageData.objectTypes /> <#assign objectTypes = editConfiguration.pageData.objectTypes />
<#assign objectTypesSize = objectTypes?length /> <#assign objectTypesSize = objectTypes?length />
<#assign objectTypesExist = false /> <#assign objectTypesExist = false />
@ -40,7 +40,7 @@
<#assign formTitle = editConfiguration.formTitle /> <#assign formTitle = editConfiguration.formTitle />
<#if editConfiguration.formTitle?contains("collaborator") > <#if editConfiguration.formTitle?contains("collaborator") >
<#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" /> <#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" />
<#elseif editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")> <#elseif rangeVClassURI?contains("IAO_0000030")>
<#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/> <#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
</#if> </#if>
<#--In order to fill out the subject--> <#--In order to fill out the subject-->

4
webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
View file

@ -7,8 +7,8 @@
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/> <input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}"/>
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/> <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri}"/> <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}"/>
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri}"/> <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}"/>
<input type="hidden" name="cmd" value="delete"/> <input type="hidden" name="cmd" value="delete"/>
<input type="hidden" name="editKey" value="${editConfiguration.editKey}"/> <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
<#if editConfiguration.dataProperty = true> <#if editConfiguration.dataProperty = true>