svn commit: r1847398 - in /ofbiz: ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl

Author: jleroux
Date: Sun Nov 25 08:40:23 2018
New Revision: 1847398

URL: http://svn.apache.org/viewvc?rev=1847398&view=rev
Log:
Fixed: Instructions for Configurable PC don't work
(OFBIZ-10542)

This concerns only R16, R17 and the trunk. The "Instructions" button was not
present in R13.

This kind of message shows:
Trunk:
<a href="javascript:showErrorAlert('The following errors occurred','');"
R16:
<a href="javascript:showErrorAlert(" the="" following="" errors="" occurred","")

The same exists for all configurable products, notably Gold Pizza

Thanks: Priya Sharma

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1847398&r1=1847397&r2=1847398&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/entry/catalog/ConfigProductDetail.ftl Sun Nov 25 08:40:23 2018
@@ -458,7 +458,7 @@ function getConfigDetails() {
                 <a name='#${question.getConfigItem().getString("configItemId")}'></a>
                 <div>${question.description!}</div>
                 <#assign instructions = question.content.get("INSTRUCTIONS", "html")!>
-                <#if instructions?has_content>
+                <#if instructions?has_content && instructions != "">
                   <a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${instructions}");" class="buttontext">Instructions</a>
                 </#if>
                 <#assign image = question.content.get("IMAGE_URL", "url")!>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl?rev=1847398&r1=1847397&r2=1847398&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl Sun Nov 25 08:40:23 2018
@@ -516,7 +516,7 @@ ${virtualJavaScript!}
                   <a name='#${question.getConfigItem().getString("configItemId")}'></a>
                   <div>${StringUtil.wrapString(question.description!)}</div>
                   <#assign instructions = question.content.get("INSTRUCTIONS", "html")!>
-                  <#if instructions?has_content>
+                  <#if instructions?has_content && instructions != "">
                     <a href="javascript:showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${instructions}');"
                     class="btn btn-outline-secondary btn-sm">Instructions</a>
                   </#if>