Author: jleroux
Date: Thu Sep 3 08:33:00 2009
New Revision: 810809
URL:
http://svn.apache.org/viewvc?rev=810809&view=revLog:
Should fix an issue reported by Ruth Hoffman at
https://issues.apache.org/jira/browse/OFBIZ-2865 - OFBIZ-2865 : "productdetail.ftl returns a Freemarker error for digital download products when no contentName exists"
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=810809&r1=810808&r2=810809&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Thu Sep 3 08:33:00 2009
@@ -299,7 +299,7 @@
<img id="detailImage" src="/images/defaultImage.jpg" name="mainImage"/>
</#if>
</td>
- <td>
+ <td>
<#if productAdditionalImage1?string?has_content>
<div class="additionalImage">
<a href="javascript:void(0);" swapDetail="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${productAdditionalImage1}</@ofbizContentUrl>" vspace="5" hspace="5" border="0" width="200"/></a>
@@ -626,7 +626,7 @@
<div id="download-files">
<div>${uiLabelMap.OrderDownloadFilesTitle}:</div>
<#list downloadProductContentAndInfoList as downloadProductContentAndInfo>
- <div>${downloadProductContentAndInfo.contentName}<#if downloadProductContentAndInfo.description?has_content> - ${downloadProductContentAndInfo.description}</#if></div>
+ <div>${downloadProductContentAndInfo.contentName?if_exists}<#if downloadProductContentAndInfo.description?has_content> - ${downloadProductContentAndInfo.description}</#if></div>
</#list>
</div>
</#if>