diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java index b4273cd351bbc957a241b0b767009e8bd0c595fa..e153e8f9d8c6d777a025b94690902e4caf89811f 100644 --- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java +++ b/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) { diff --git a/src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js b/src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js index adcc2eec441a824bf542eedd8f7a7b6e929d9194..ce4287301aa043cd4c9c9ca172c75295d42f2e00 100644 --- a/src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js +++ b/src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js @@ -1,2 +1,2 @@ - window.location = "/dm/views/home.xhtml"; + window.location = "list.xhtml";