svn commit: r1847400 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/catalog/ConfigProductDetail.ftl

Author: jleroux
Date: Sun Nov 25 08:41:49 2018
New Revision: 1847400

URL: http://svn.apache.org/viewvc?rev=1847400&view=rev
Log:
"Applied fix from plugins for revision: 1847398  "
------------------------------------------------------------------------
r1847398 | jleroux | 2018-11-25 09:40:23 +0100 (dim. 25 nov. 2018) | 15 lignes

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-plugins/branches/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ConfigProductDetail.ftl

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 25 08:41:49 2018
@@ -11,4 +11,4 @@
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
 /ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ConfigProductDetail.ftl?rev=1847400&r1=1847399&r2=1847400&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/ConfigProductDetail.ftl Sun Nov 25 08:41:49 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>