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

Author: jleroux
Date: Wed Mar 23 19:47:44 2011
New Revision: 1084696

URL: http://svn.apache.org/viewvc?rev=1084696&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/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl
    ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 19:47:44 2011
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,107595
 2,1076115,1080218,1080959,1083144
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,107595
 2,1076115,1080218,1080959,1083144,1084572,1084671,1084689

Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl?rev=1084696&r1=1084695&r2=1084696&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/catalog/product/ProductBarCode.fo.ftl Wed Mar 23 19:47:44 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/release10.04/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml?rev=1084696&r1=1084695&r2=1084696&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml Wed Mar 23 19:47:44 2011
@@ -30,8 +30,6 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Product" value-field="product"/>
-                <set field="productName" from-field="product.productName"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -328,7 +326,7 @@ under the License.
                 <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleEditProductAssetUsage}">
-                            <include-form name="EditProductAssetUsage" location="component://product/widget/catalog/ProductForms.xml"/>                        
+                            <include-form name="EditProductAssetUsage" location="component://product/widget/catalog/ProductForms.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleEditProductAssetUsage}">
                             <container>
@@ -1234,7 +1232,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>
@@ -1305,7 +1304,7 @@ under the License.
             </widgets>
         </section>
     </screen>
-    
+
     <screen name="BestSellingProducts">
         <section>
             <actions>