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

Update level on ARG_0000028 faux properties was not working correctly due to a bug in the edit link macro.

Browse source
This commit is contained in:
Tim Worrall 2016-04-29 13:01:35 -04:00
parent 8b088478f0
commit 9f21c8c976
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
View file

@ -177,25 +177,23 @@ name will be used as the label. -->
</#if> </#if>
</#macro> </#macro>
<#macro editLink propertyLocalName propertyName statement rangeUri=""> <#macro editLink propertyLocalName propertyName statement rangeUri="">
<#if propertyLocalName?contains("ARG_2000028")> <#local url = statement.editUrl>
<#if rangeUri?contains("Address")> <#if url?has_content>
<#local url = statement.editUrl + "&addressUri=" + "${statement.address!}"> <#if propertyLocalName?contains("ARG_2000028")>
<#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")> <#if rangeUri?contains("Address")>
<#local url = statement.editUrl + "&phoneUri=" + "${statement.phone!}"> <#local url = url + "&addressUri=" + "${statement.address!}">
<#elseif rangeUri?contains("Work") || rangeUri?contains("Email")> <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")>
<#local url = statement.editUrl + "&emailUri=" + "${statement.email!}"> <#local url = url + "&phoneUri=" + "${statement.phone!}">
<#elseif rangeUri?contains("Name")> <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")>
<#local url = statement.editUrl + "&fullNameUri=" + "${statement.fullName!}"> <#local url = url + "&emailUri=" + "${statement.email!}">
<#elseif rangeUri?contains("Title")> <#elseif rangeUri?contains("Name")>
<#local url = statement.editUrl + "&titleUri=" + "${statement.title!}"> <#local url = url + "&fullNameUri=" + "${statement.fullName!}">
</#if> <#elseif rangeUri?contains("Title")>
<#else> <#local url = url + "&titleUri=" + "${statement.title!}">
<#local url = statement.editUrl> </#if>
</#if> </#if>
<#if url?has_content>
<@showEditLink propertyLocalName url /> <@showEditLink propertyLocalName url />
</#if> </#if>
</#macro> </#macro>
<#macro showEditLink propertyLocalName url> <#macro showEditLink propertyLocalName url>