merging r10009 to the trunk

This commit is contained in:
tworrall 2012-08-13 16:14:28 +00:00
parent eae6359a6d
commit cdd10b24f1

View file

@ -10,7 +10,7 @@
<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
</#if>
<#else>
<#assign statement = editConfiguration.pageData.dataPropertyLexicalValue />
<#assign statement = editConfiguration.dataLiteralValuesAsString />
</#if>
<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
@ -24,7 +24,7 @@
<#include deletionTemplateName />
</#if>
<#else>
${statement}
${statement}
</#if>
</p>
@ -48,4 +48,4 @@
<#if editConfiguration.objectProperty = true>
</p>
</#if>
</form>
</form>