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

Fixed problem that was causing error on individual profile page when logged in.

Browse source
This commit is contained in:
bdc34 2010-11-05 21:49:15 +00:00
parent bba7eb9064
commit 0028509f63
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/templates/entity/entityAdmin.jsp
View file

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