[ofbiz-framework] 02/03: Fixed: Geo Location functionality of facility contact information screen is not working (OFBIZ-7343)

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 8675993ac3667c7054dd3d52abd9c01e230494b9
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Mon Sep 28 10:48:01 2020 +0200

    Fixed: Geo Location functionality of facility contact information screen is not working (OFBIZ-7343)
    
    Long ago I spotted an issue:
    
    <<In French I got this js error message in console (else nothing apears anywhere)
    
    SyntaxError: missing ) after argument list
    ...=9000&partyId=Company', 'Adresse d'expédition - Géolocalisation', '450', '550')
    
    It's due to the quote in "Adresse d'expédition"
    We could though commit by escaping the popUptitle, but I also think we should
    change from the popup (and everywhere the same is used) to a modal layered
    window.>>
    
    Turned out that:
    <<I had a quick look to see if we could not use a modal layer instead of a popup,
    but it's not obvious to use modal layer from Freemarker. This does not mean that
    it can't be done... I'll see later...>>
    
    Here is a late workaround :)
---
 applications/party/template/party/profileblocks/Contact.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/party/template/party/profileblocks/Contact.ftl b/applications/party/template/party/profileblocks/Contact.ftl
index 7467fe4..c917c68 100644
--- a/applications/party/template/party/profileblocks/Contact.ftl
+++ b/applications/party/template/party/profileblocks/Contact.ftl
@@ -65,7 +65,7 @@ under the License.
                       <#if contactMechPurposeType?has_content>
                         <#assign popUptitle = contactMechPurposeType.get("description", locale) + uiLabelMap.CommonGeoLocation>
                       </#if>
-                      <a href="javascript:popUp('<@o...@ofbizUrl>', '${popUptitle!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
+                      <a href="javascript:popUp('<@o...@ofbizUrl>', '${StringUtil.wrapString(popUptitle)!}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a>
                     </#if>
                   </#if>
                 <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId>