Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
hudajkhan 2013-11-12 08:58:26 -05:00
commit 30434229d1

View file

@ -30,9 +30,9 @@
<input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}" role="input" />
<input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri}" role="input" />
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri}" role="input" />
<input type="hidden" name="deleteObjectUri" value="${editConfiguration.customDeleteObjectUri}" />
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}" role="input" />
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}" role="input" />
<input type="hidden" name="deleteObjectUri" value="${editConfiguration.customDeleteObjectUri!}" />
<#if editConfiguration.dataProperty = true>
<input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" />
<input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" role="input" />