svn commit: r1847399 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/order/template/entry/catalog/ConfigProductDetail.ftl

Author: jleroux
Date: Sun Nov 25 08:41:34 2018
New Revision: 1847399

URL: http://svn.apache.org/viewvc?rev=1847399&view=rev
Log:
"Applied fix from trunk 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-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/catalog/ConfigProductDetail.ftl

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 25 08:41:34 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/catalog/ConfigProductDetail.ftl?rev=1847399&r1=1847398&r2=1847399&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/template/entry/catalog/ConfigProductDetail.ftl Sun Nov 25 08:41:34 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")!>