svn commit: r544433 - /ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh

[lektran]

Author: lektran
Date: Tue Jun  5 02:47:49 2007
New Revision: 544433

URL: http://svn.apache.org/viewvc?view=rev&rev=544433
Log:
Applied fix from trunk for revision: 542325

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

Modified: ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh?view=diff&rev=544433&r1=544432&r2=544433
==============================================================================
--- ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh (original)
+++ ofbiz/branches/release4.0/applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.bsh Tue Jun  5 02:47:49 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) {