Author: jleroux
Date: Tue Oct 27 10:07:41 2009
New Revision: 830114
URL:
http://svn.apache.org/viewvc?rev=830114&view=revLog:
Was missing in r830093 because of a bad merge (WinMerge caught me)
Modified:
ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl?rev=830114&r1=830113&r2=830114&view=diff==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl Tue Oct 27 10:07:41 2009
@@ -15,6 +15,11 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><#list productExportList as productExportMap><#assign productCategoryCount=0/><#assign productFeatureCount=0/>
-${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list>
-</#list>
\ No newline at end of file
+-->
+<#if productExportList?has_content>
+ <#list productExportList as productExportMap><#assign productCategoryCount=0/><#assign productFeatureCount=0/>
+ ${productExportMap.productId} <#if productExportMap.productFeatureCustom?has_content>${productExportMap.productFeatureCustom.description?if_exists}</#if> <#list productExportMap.productCategories as productCategoryAndMember><#if productCategoryAndMember.categoryName?has_content><#if productCategoryCount > 0>,</#if>${productCategoryAndMember.categoryName}<#assign productCategoryCount=productCategoryCount + 1/></#if></#list> <#list productExportMap.productFeatures as productFeatureAndAppl><#if productFeatureAndAppl.description?has_content><#if productFeatureCount > 0>,</#if>${productFeatureAndAppl.description}<#assign productFeatureCount=productFeatureCount + 1/></#if></#list>
+ </#list>
+<#else>
+ ${uiLabelMap.ProductErrorNothingToExport}
+</#if>