NPE in tabAdmin. NIHVIVO-1325

webapp/web/templates/tabs/tabAdmin.jsp

@@ -1,6 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Tab" %>
+<%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
+
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ page errorPage="/error.jsp"%>
 <% /***********************************************
@@ -27,7 +29,7 @@
     }
 %>
 
-<c:if test="${sessionScope.loginHandler.loginStatus == 'authenticated' && sessionScope.loginHandler.loginRole > 3 }">
+<% if ( LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.EDITOR))  {  %>   	
   <c:set var='tab' value='${requestScope.leadingTab}'/><%/* just moving this into page scope for easy use */ %>
    	<c:set var='portal' value='${requestScope.portalBean.portalId}'/>
 	<div class='admin bottom'>  	
@@ -42,4 +44,4 @@
     	<a href="${editHref}">edit tab: <em>${tab.title}</em></a> 
     	<% /* | <a href='<c:url value="cloneEntity?home=${portal}&tabId=${tab.tabId}"/>'> <i>clone tab</i> ${tab.title}</a> */ %>      
     </div>
-</c:if>
+<% } %>