From 0028509f6311b155b4142cf866e2b39ec6efa731 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 5 Nov 2010 21:49:15 +0000
Subject: [PATCH] Fixed problem that was causing error on individual profile
 page when logged in.

---
 webapp/web/templates/entity/entityAdmin.jsp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/webapp/web/templates/entity/entityAdmin.jsp b/webapp/web/templates/entity/entityAdmin.jsp
index 402e5eaa7..b38e1a7fe 100644
--- a/webapp/web/templates/entity/entityAdmin.jsp
+++ b/webapp/web/templates/entity/entityAdmin.jsp
@@ -4,6 +4,7 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.flags.PortalFlagChoices" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
+<%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ page errorPage="/error.jsp"%>
@@ -29,10 +30,8 @@
             throw new JspException(e);
         }
 %>
-<c:if test="${sessionScope.loginHandler != null &&
-              sessionScope.loginHandler.loginStatus == 'authenticated' &&
-              sessionScope.loginHandler.loginRole >= sessionScope.loginHandler.editor }">
-    <c:set var='entity' value='${requestScope.entity}'/><%/* just moving this into page scope for easy use */ %>
+<% if ( LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.EDITOR))  {  %>    
+<c:set var='entity' value='${requestScope.entity}'/><%/* just moving this into page scope for easy use */ %>
     <c:set var='portal' value='${requestScope.portal}'/> 
     <div class='admin top'>
         <h3 class="toggle">Admin Panel</h3>
@@ -45,5 +44,5 @@
           <p>Resource URI: <c:out value="${entity.URI}"/></p>
           </div>
     </div>
+<% } %>
 
-</c:if>