svn commit: r542325 - /ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh

[jaz-3]

Author: jaz
Date: Mon May 28 14:47:12 2007
New Revision: 542325

URL: http://svn.apache.org/viewvc?view=rev&rev=542325
Log:
small adjustment

Modified:
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh?view=diff&rev=542325&r1=542324&r2=542325
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh Mon May 28 14:47:12 2007
@@ -21,11 +21,11 @@
 import org.ofbiz.entity.*;
 import org.ofbiz.base.util.*;
 
-delegator = request.getAttribute("delegator");
-security = request.getAttribute("security");
-userLogin = session.getAttribute("userLogin");
+//delegator = request.getAttribute("delegator");
+//security = request.getAttribute("security");
+//userLogin = session.getAttribute("userLogin");
 
-shipmentId = request.getParameter("shipmentId");
+shipmentId = parameters.get("shipmentId");
 if (shipmentId == null) {
     shipmentId = request.getAttribute("shipmentId");
 }
@@ -50,7 +50,7 @@
 
 // check permission
 hasPermission = false;
-if (security.hasEntityPermission("FACILITY", "_VIEW", session)) {
+if (security.hasEntityPermission("FACILITY", "_VIEW", userLogin)) {
     hasPermission = true;
 } else {
     if (shipment != null) {