svn commit: r1725231 - in /ofbiz/branches/release15.12: ./ applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl

[Deepak Dixit-5]

Author: deepak
Date: Mon Jan 18 11:17:19 2016
New Revision: 1725231

URL: http://svn.apache.org/viewvc?rev=1725231&view=rev
Log:
Applied fix from trunk for revision: 1725217
===

Fixed stack trace on configproductdetail.ftl, Used correct method to get INSTRUCTIONS from ProductConfigItemContentWrapper.

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 11:17:19 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006
+/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217

Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1725231&r1=1725230&r2=1725231&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Mon Jan 18 11:17:19 2016
@@ -457,7 +457,7 @@ function getConfigDetails() {
               <#if question.isFirst()>
                 <a name='#${question.getConfigItem().getString("configItemId")}'></a>
                 <div>${question.description!}</div>
-                <#assign instructions = question.content.get("INSTRUCTIONS")!>
+                <#assign instructions = question.content.get("INSTRUCTIONS", "html")!>
                 <#if instructions?has_content>
                   <a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${instructions}");" class="buttontext">Instructions</a>
                 </#if>