From fc535097c4d2060b6f342576589fdcf2219b22c5 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 2 Jun 2011 20:09:21 +0000
Subject: [PATCH] NIHVIVO-2279 transitioning toward UserAccount

---
 .../vitro/webapp/beans/BaseResourceBean.java  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index e661e9dcd..4300e2ab0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -68,21 +68,22 @@ public class BaseResourceBean implements ResourceBean {
             return RoleLevel.values()[0];            
         }
         
-        public static RoleLevel getRoleFromLoginStatus(HttpServletRequest req) {
-            int level = LoginStatusBean.getBean(req).getSecurityLevel();
-            if( level == LoginStatusBean.ANYBODY)    // 0
-                return PUBLIC;
-            if( level == LoginStatusBean.NON_EDITOR) // 1
-                return SELF;
-            if( level == LoginStatusBean.EDITOR )    // 4
-                return EDITOR;
-            if( level == LoginStatusBean.CURATOR )   // 5
-                return CURATOR;
-            if( level == LoginStatusBean.DBA )       // 50
-                return DB_ADMIN;
-            else
-                return PUBLIC;
-        }
+		public static RoleLevel getRoleFromLoginStatus(HttpServletRequest req) {
+			User u = LoginStatusBean.getCurrentUser(req);
+			if (u == null) {
+				return PUBLIC;
+			} else if ("1".equals(u.getRoleURI())) {
+				return SELF;
+			} else if ("4".equals(u.getRoleURI())) {
+				return EDITOR;
+			} else if ("5".equals(u.getRoleURI())) {
+				return CURATOR;
+			} else if ("50".equals(u.getRoleURI())) {
+				return DB_ADMIN;
+			} else {
+				return PUBLIC;
+			}
+		}
     }
 
     public boolean isAnonymous() {