litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NPE in tabAdmin. NIHVIVO-1325

Browse source
This commit is contained in:
bdc34 2010-12-06 18:48:22 +00:00
parent cae6670937
commit 272d90343b
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/templates/tabs/tabAdmin.jsp
View file

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