svn commit: r818358 - in /ofbiz/trunk/applications/product/webapp/catalog: WEB-INF/actions/product/EditProductContentContent.groovy product/ProductForms.xml

[lektran]

Author: lektran
Date: Thu Sep 24 03:48:05 2009
New Revision: 818358

URL: http://svn.apache.org/viewvc?rev=818358&view=rev
Log:
Allow all current image related ProductContentTypes to display the image upload form, in an ideal world we'd have a better way of doing this.

Also renamed the form to better describe its purpose, the request map and service name could do with the same at some point

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

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=818358&r1=818357&r2=818358&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 Thu Sep 24 03:48:05 2009
@@ -116,8 +116,8 @@
     context.downloadData = downloadData;
 } else if ("FULFILLMENT_EXTERNAL".equals(productContentTypeId)) {
     context.contentFormName = "EditProductContentExternal";
-} else if (productContentTypeId && productContentTypeId.indexOf("ADDITIONAL_IMAGE") > -1) {
-    context.contentFormName = "EditProductAdditionalImageContent";
+} else if (productContentTypeId && productContentTypeId.indexOf("_IMAGE") > -1) {
+    context.contentFormName = "EditProductContentImage";
 } else {
     //Assume it is a generic simple text content
     textData = [:];

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=818358&r1=818357&r2=818358&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Thu Sep 24 03:48:05 2009
@@ -764,7 +764,7 @@
         <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
-    <form name="EditProductAdditionalImageContent" type="upload" target="addAdditionalImageContentForProduct" title="">
+    <form name="EditProductContentImage" type="upload" target="addAdditionalImageContentForProduct" title="">
         <auto-fields-entity entity-name="ProductContent" map-name="productContentData"/>
         <field name="productContentTypeId"><display-entity entity-name="ProductContentType" also-hidden="true"/></field>
         <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field>