svn commit: r1084702 - in /ofbiz/branches/release09.04/applications/product: webapp/catalog/product/ProductBarCode.fo.ftl widget/catalog/ProductScreens.xml

Author: jleroux
Date: Wed Mar 23 19:55:01 2011
New Revision: 1084702

URL: http://svn.apache.org/viewvc?rev=1084702&view=rev
Log:
"Applied fix from trunk for revision: 1084671"
------------------------------------------------------------------------
r1084671 | jleroux | 2011-03-23 19:52:45 +0100 (mer., 23 mars 2011) | 6 lines

A modified patch from Konstantin Nikkel "Exception while creating a productBarCode" https://issues.apache.org/jira/browse/OFBIZ-4226 - OFBIZ-4226

If you try to create a barcode of a product that has no productName as content, you get the exception "Variable pruductName does not exist".
An exclamation mark in the "ProductBarCode.fo.ftl" manages this problem.

I added this feature, so I changed it a bit more by using also internalName as default for productName and changed the decorator since now productName is not needed (better to do that only in the ProductBarCode.fo screen, I checked it's no used anywhere else)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl
    ofbiz/branches/release09.04/applications/product/widget/catalog/ProductScreens.xml

Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl?rev=1084702&r1=1084701&r2=1084702&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl Wed Mar 23 19:55:01 2011
@@ -32,7 +32,7 @@ under the License.
     <fo:page-sequence master-reference="main">
         <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
             <fo:block text-align="center">
-                 ${productName}
+                 ${productName!}
             </fo:block>
             <fo:block text-align="center">
                 <fo:instream-foreign-object>

Modified: ofbiz/branches/release09.04/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/widget/catalog/ProductScreens.xml?rev=1084702&r1=1084701&r2=1084702&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/product/widget/catalog/ProductScreens.xml Wed Mar 23 19:55:01 2011
@@ -1730,7 +1730,8 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="productId" from-field="parameters.productId"/>
-                <set field="productName" from-field="parameters.productName"/>
+                <entity-one entity-name="Product" value-field="product" auto-field-map="true"/>
+                <set field="productName" from-field="product.productName" default-value="product.internalName"/>
             </actions>
             <widgets>
                 <platform-specific>