Author: jleroux Date: Wed Feb 21 04:56:41 2007 New Revision: 509990 URL: http://svn.apache.org/viewvc?view=rev&rev=509990 Log: Commented out product.bsh part wich had the same erroneous snippet trying to come back to the same page when login or changing language. Added a comment from David's advice to use the same metho than add to cart in all concerned files (category.bsh prodcut.bsh and main.bsh)
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh?view=diff&rev=509990&r1=509989&r2=509990 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh Wed Feb 21 04:56:41 2007 @@ -30,6 +30,9 @@ * The whole thing should be re-thought, and should preferably NOT use a custom session variable or try to go through the main page. * * NOTE: see section commented out in category.bsh for the other part of this. + * + * NOTE JLR 20070221 this should be done using the same method than in add to cart. I will do it like that and remove all this after. + * productCategoryId = session.getAttribute("productCategoryId"); if (productCategoryId == null) { request.setAttribute("productCategoryId", promoCat); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh?view=diff&rev=509990&r1=509989&r2=509990 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh Wed Feb 21 04:56:41 2007 @@ -39,6 +39,8 @@ /* NOTE DEJ20070220: this is a weird way to do this and caused unacceptable side effects as described in the related * comment in the main.bsh file * + * NOTE JLR 20070221 this should be done using the same method than in add to cart. I will do it like that and remove all this after. + * if (productCategoryId != null) { session.setAttribute("productCategoryId",productCategoryId);// for language change previousParams = session.getAttribute("_PREVIOUS_PARAMS_"); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh?view=diff&rev=509990&r1=509989&r2=509990 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh Wed Feb 21 04:56:41 2007 @@ -36,6 +36,9 @@ detailScreen = "productdetail"; productId = requestParams.get("product_id"); +/* + * NOTE JLR 20070221 this should be done using the same method than in add to cart. I will do it like that and remove all this after. + * if (productId != null) { previousParams = session.getAttribute("_PREVIOUS_PARAMS_"); if (previousParams != null && previousParams.length() > 0) { @@ -46,7 +49,7 @@ } session.setAttribute("_PREVIOUS_PARAMS_", previousParams); // for login context.put("previousParams", previousParams); -} +}*/ // get the product entity if (productId != null) {