From 37516fa804b87d51e59b438c05595fc2d4643a84 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 9 Feb 2015 17:37:05 +0000
Subject: [PATCH]
---
.../dm/portal/controllers/ExperimentController.java | 10 +++++-----
.../web/resources/js/common/forwardNotAuthorized.js | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
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 b4273cd3..e153e8f9 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 adcc2eec..ce428730 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";
--
GitLab