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

Merge pull request #235 from brianjlowe/issue/VIVO-1989

Browse source 
[VIVO-1989] URL-encode vCard-related resource URIs appended to edit links
This commit is contained in:
Ben 2021-06-02 09:30:30 -06:00 • committed by GitHub
commit 1819fa1dd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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