svn commit: r1837807 - /ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl

[pg...@apache.org]

Author: pgil
Date: Fri Aug 10 14:12:52 2018
New Revision: 1837807

URL: http://svn.apache.org/viewvc?rev=1837807&view=rev
Log:
Fixed: Use of layered-modal with parameter does not work
(OFBIZ-10511)

Thanks Deepak and Aditya for the review and providing a better patch

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl

Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1837807&r1=1837806&r2=1837807&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/macro/HtmlFormMacroLibrary.ftl Fri Aug 10 14:12:52 2018
@@ -797,17 +797,17 @@ Parameter: delegatorName, String, option
 </#macro>
 <#macro makeHyperlinkString hiddenFormName imgSrc title  alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
     <#if uniqueItemName?has_content>
-        <#local params = "{ 'presentation': 'layer'">
+        <#local params = "{ \"presentation\": \"layer\"">
         <#if targetParameters?has_content>
           <#assign parameterMap = targetParameters?eval>
           <#assign parameterKeys = parameterMap?keys>
           <#list parameterKeys as key>
-            <#local params += ",'${key}': '${parameterMap[key]}'">
+            <#local params += ",\"${key}\": \"${parameterMap[key]}\"">
           </#list>
         </#if>
         <#local params += " }">
         <a href="javascript:void(0);" id="${uniqueItemName}_link"
-           data-dialog-params="${params}"
+           data-dialog-params='${params}'
            data-dialog-width="${width}"
            data-dialog-height="${height}"
            data-dialog-url="${linkUrl}"