Author: jleroux
Date: Wed Feb 14 15:14:11 2007
New Revision: 507737
URL: http://svn.apache.org/viewvc?view=rev&rev=507737
Log:
Revert previous commit (using session attribute) at demand of David E. J.
Should better use _PREVIOUS_PARAMS_ instead... Will try tomorrow...
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/main.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
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/login.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh?view=diff&rev=507737&r1=507736&r2=507737
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh
Wed Feb 14 15:14:11 2007
@@ -22,16 +22,7 @@
import org.ofbiz.webapp.control.*;
context.put("autoUserLogin", session.getAttribute("autoUserLogin"));
-context.put("autoLogoutUrl", LoginWorker.makeLoginUrl(request, "autoLogout"));
-
-productId = session.getAttribute("productId");
-if(productId != null) {
- context.put("productId",productId);
-}
-productCategoryId = session.getAttribute("productCategoryId");
-if(productCategoryId != null) {
- context.put("productCategoryId",productCategoryId);
-}
+context.put("autoLogoutUrl", LoginWorker.makeLoginUrl(request, "autoLogout"));
previousParams = session.getAttribute("_PREVIOUS_PARAMS_");
if (previousParams != null && previousParams.length() > 0) {
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=507737&r1=507736&r2=507737
==============================================================================
---
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 14 15:14:11 2007
@@ -21,13 +21,7 @@
catalogId = CatalogWorker.getCurrentCatalogId(request);
promoCat = CatalogWorker.getCatalogPromotionsCategoryId(request, catalogId);
-productCategoryId = session.getAttribute("productCategoryId");
-if (productCategoryId == null) {
- request.setAttribute("productCategoryId", promoCat);
-}
-else {
- request.setAttribute("productCategoryId", productCategoryId);
-}
+request.setAttribute("productCategoryId", promoCat);
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl?view=diff&rev=507737&r1=507736&r2=507737
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl Wed Feb 14
15:14:11 2007
@@ -33,8 +33,8 @@
<div class="screenlet-header">
<div class="boxhead">${uiLabelMap.CommonRegistered}</div>
</div>
- <div class="screenlet-body" style="text-align: center;">
- <form method="post"
action="<@ofbizUrl>login${previousParams?if_exists}?category_id=${productCategoryId?if_exists}&product_id=${productId?if_exists}</@ofbizUrl>"
name="loginform">
+ <div class="screenlet-body" style="text-align: center;">
+ <form method="post"
action="<@ofbizUrl>login${previousParams}</@ofbizUrl>" name="loginform">
<div class="tabletext">
${uiLabelMap.CommonUsername}:
<input type="text" class="inputBox" name="USERNAME"
value="<#if
requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif
autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>" size="20"/>
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=507737&r1=507736&r2=507737
==============================================================================
---
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 14 15:14:11 2007
@@ -29,17 +29,11 @@
detailScreen = "categorydetail";
catalogName = CatalogWorker.getCatalogName(request);
delegator = request.getAttribute("delegator");
-
productCategoryId = request.getAttribute("productCategoryId");
if (productCategoryId == null) {
productCategoryId = parameters.get("category_id");
}
-
context.put("productCategoryId", productCategoryId);
-
-if (productCategoryId != null) {
- session.setAttribute("productCategoryId",productCategoryId);
-}
category = delegator.findByPrimaryKeyCache("ProductCategory",
UtilMisc.toMap("productCategoryId", productCategoryId));
if (category != null) {
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=507737&r1=507736&r2=507737
==============================================================================
---
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 14 15:14:11 2007
@@ -36,10 +36,6 @@
detailScreen = "productdetail";
productId = requestParams.get("product_id");
-if(productId != null) {
- session.setAttribute("productId",productId);
-}
-
// get the product entity
if (productId != null) {
product = delegator.findByPrimaryKeyCache("Product",
UtilMisc.toMap("productId", productId));
