No commit message

No commit message

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java

@@ -438,11 +438,11 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
     public boolean isRestricted() {
         if (current == null) {
             return true;
-        }     
-        int managerRoleId = experimentRoles.get(RoleTypeName.MANAGER).getId();
-        int piRoleId = experimentRoles.get(RoleTypeName.PI).getId();
-        UserInfo logged = (UserInfo) SessionUtility.getUser();
-        return (logged.getExperimetRole(managerRoleId, current.getId()) == null) && (logged.getExperimetRole(piRoleId, current.getId()) == null);
+        } 
+            int managerRoleId = experimentRoles.get(RoleTypeName.MANAGER).getId();
+            int piRoleId = experimentRoles.get(RoleTypeName.PI).getId();
+            UserInfo logged = (UserInfo) SessionUtility.getUser();
+            return (logged.getExperimetRole(managerRoleId, current.getId()) == null) && (logged.getExperimetRole(piRoleId, current.getId()) == null);
     }
     
     public boolean canDeleteExperiment(int experimentId) {

src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js

-  window.location = "/dm/views/home.xhtml";
+  window.location = "list.xhtml";