svn commit: r811715 - in /ofbiz/branches/release09.04: ./ applications/order/webapp/ordermgr/entry/catalog/ specialpurpose/ecommerce/webapp/ecommerce/catalog/

Author: jleroux
Date: Sat Sep  5 21:19:08 2009
New Revision: 811715

URL: http://svn.apache.org/viewvc?rev=811715&view=rev
Log:
"Applied fix from trunk for revision: 811714  "
------------------------------------------------------------------------
r811714 | jleroux | 2009-09-05 23:12:31 +0200 (sam. 05 sept. 2009) | 1 ligne

Complete r811708
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
    ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep  5 21:19:08 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=811715&r1=811714&r2=811715&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Sat Sep  5 21:19:08 2009
@@ -71,8 +71,8 @@
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             alert(hack.innerHTML);
             return;
-            return;
         }
+        detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
         popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550');
     }
 

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=811715&r1=811714&r2=811715&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Sat Sep  5 21:19:08 2009
@@ -39,8 +39,8 @@
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             alert(hack.innerHTML);
             return;
-            return;
         }
+        window[fieldName] = window[fieldName].replace(/\&\#47;/g, "/");
         popUp("<@ofbizUrl>detailImage?detail=" + window[fieldName] + "</@ofbizUrl>", 'detailImage', '400', '550');
     }
 

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=811715&r1=811714&r2=811715&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Sat Sep  5 21:19:08 2009
@@ -109,8 +109,8 @@
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             alert(hack.innerHTML);
             return;
-            return;
         }
+        detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
         popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550');
     }
 

Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=811715&r1=811714&r2=811715&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sat Sep  5 21:19:08 2009
@@ -71,9 +71,8 @@
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             alert(hack.innerHTML);
             return;
-            return;
         }
-        alert(detailImageUrl);
+        detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/");
         popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550');
     }