svn commit: r902354 - in /ofbiz/trunk/applications/product: data/ProductTypeData.xml webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy

[ashish-18]

Author: ashish
Date: Sat Jan 23 06:57:34 2010
New Revision: 902354

URL: http://svn.apache.org/viewvc?rev=902354&view=rev
Log:
Applied patch from jira issue: OFBIZ-3422.
Adding few more product content type records.

Thanks Vivek for the contribution.

Modified:
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=902354&r1=902353&r2=902354&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Sat Jan 23 06:57:34 2010
@@ -257,6 +257,9 @@
     <ProductContentType description="Add To Cart Label" hasTable="N" parentTypeId="" productContentTypeId="ADDTOCART_LABEL"/>
     <ProductContentType description="Add To Cart Image" hasTable="N" parentTypeId="" productContentTypeId="ADDTOCART_IMAGE"/>
     <ProductContentType description="Short Sales Pitch" hasTable="N" parentTypeId="" productContentTypeId="SHORT_SALES_PITCH"/>
+    <ProductContentType description="Installation" hasTable="N" parentTypeId="DIGITAL_DOWNLOAD" productContentTypeId="INSTALLATION"/>
+    <ProductContentType description="Specification" hasTable="N" parentTypeId="DIGITAL_DOWNLOAD" productContentTypeId="SPECIFICATION"/>
+    <ProductContentType description="Warranty" hasTable="N" parentTypeId="DIGITAL_DOWNLOAD" productContentTypeId="WARRANTY"/>
 
     <ProdConfItemContentType description="Image" hasTable="N" parentTypeId="" confItemContentTypeId="IMAGE_URL"/>
     <ProdConfItemContentType description="Description" hasTable="N" parentTypeId="" confItemContentTypeId="DESCRIPTION"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy?rev=902354&r1=902353&r2=902354&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy Sat Jan 23 06:57:34 2010
@@ -134,6 +134,12 @@
     context.contentFormName = "EditProductContentSimpleText";
     context.textData = textData;
 }
+if (productContentTypeId) {
+    productContentType = delegator.findOne("ProductContentType", [productContentTypeId : productContentTypeId], false);
+    if (productContentType && "DIGITAL_DOWNLOAD".equals(productContentType.parentTypeId)) {
+        context.contentFormName = "EditProductContentDownload";
+    }
+}
 
 context.productContentData = productContentData;
 context.content = content;