svn commit: r1293377 - in /ofbiz/branches/release11.04: ./ specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl

Author: jleroux
Date: Fri Feb 24 18:36:40 2012
New Revision: 1293377

URL: http://svn.apache.org/viewvc?rev=1293377&view=rev
Log:
"Applied fix from trunk for revision: 1293376"
------------------------------------------------------------------------
r1293376 | jleroux | 2012-02-24 19:36:04 +0100 (ven., 24 févr. 2012) | 7 lines

A patch from Uwe Allner "Download link for digital products on order history page contains file name, preventing correct resolve of the request" https://issues.apache.org/jira/browse/OFBIZ-4711

I created a product with product type "Finished/Digital Good", and added product content of type "Digital download", providing a file (i.e. some.pdf).
The download link in the order history of the ecommerce application after purchasing the product is rendered as
"/ecommerce/control/downloadDigitalProduct/some.pdf?dataResourceId=10060".
The file name in this URL prevents resolving the correct service (method), and instead just a "404 Not found" is generated.
The link "/ecommerce/control/downloadDigitalProduct?dataResourceId=10060" works as expected.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 18:36:40 2012
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1226378,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331,1292506
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1139860,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1208335,1209250,1209362,1210193,1210211,1212147,1214124,1220298,1221889,1221913,1222105,1222478,1226055,1226065,1226223,1226231,1226378,1227965,1229304,1229952,1231004,1231444,1232053,1232539,1244139,1291472,1292331,1292506,1293376

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=1293377&r1=1293376&r2=1293377&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Fri Feb 24 18:36:40 2012
@@ -112,7 +112,7 @@ under the License.
               <td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td>
               <td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td>
               <td>
-                <a href="<@ofbizUrl>downloadDigitalProduct/${downloadOrderRoleAndProductContentInfo.contentName?if_exists}?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>" class="button">Download</a>
+                <a href="<@ofbizUrl>downloadDigitalProduct?dataResourceId=${downloadOrderRoleAndProductContentInfo.dataResourceId}</@ofbizUrl>" class="button">Download</a>
               </td>
             </tr>
           </#list>