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

NIHVIVO-736 begin the transition from LoginFormBean to LoginStatusBean.

Browse source
This commit is contained in:
jeb228 2010-10-06 16:06:25 +00:00
parent 9e1a84e174
commit b07049a116
7 changed files with 175 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/siteAdmin/advancedDataTools.jsp
View file

@ -1,6 +1,6 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<% if (securityLevel >= loginHandler.DBA) { %>
<% if (loginBean.isLoggedInAtLeast(LoginStatusBean.DBA)) { %>
<div class="pageBodyGroup">
<h3>Advanced Data Tools</h3>

2
webapp/web/siteAdmin/dataInput.jsp
View file

@ -1,6 +1,6 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<% if (securityLevel >= loginHandler.EDITOR) { %>
<% if (loginBean.isLoggedInAtLeast(LoginStatusBean.EDITOR) { %>
<div class="pageBodyGroup">
<h3>Data Input</h3>

2
webapp/web/siteAdmin/ontologyEditor.jsp
View file

@ -2,7 +2,7 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener"%>
<% if (securityLevel >= loginHandler.CURATOR) { %>
<% if (loginBean.isLoggedInAtLeast(LoginStatusBean.CURATOR)) { %>
<div class="pageBodyGroup">

15
webapp/web/siteAdmin/siteAdminMain.jsp
View file

@ -1,5 +1,6 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener"%>
@ -11,17 +12,10 @@
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
<%
Portal portal = (Portal) request.getAttribute("portalBean");
final String DEFAULT_SEARCH_METHOD = "fulltext"; /* options are fulltext/termlike */
int securityLevel = loginHandler.ANYBODY;
String loginStatus = loginHandler.getLoginStatus();
if ( loginStatus.equals("authenticated")) {
securityLevel = Integer.parseInt( loginHandler.getLoginRole() );
}
final String DEFAULT_SEARCH_METHOD = "fulltext"; /* options are fulltext/termlike */
LoginStatusBean loginBean = LoginStatusBean.getBean(request);
%>
@ -44,9 +38,6 @@
<%@ include file="advancedDataTools.jsp" %>
<%@ include file="customReports.jsp" %>
<%--
<%@ include file="sessionPreferences.jsp" %>
--%>
</div> <!-- end adminDashboard -->
</div> <!-- end content -->

4
webapp/web/siteAdmin/siteConfiguration.jsp
View file

@ -1,6 +1,6 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<% if (securityLevel >= loginHandler.CURATOR) { %>
<% if (loginBean.isLoggedInAtLeast(LoginStatusBean.CURATOR) { %>
<div class="pageBodyGroup">
<h3>Site Configuration</h3>
@ -16,7 +16,7 @@
<li><a href="listTabs?home=<%=portal.getPortalId()%>">Tab management</a></li>
<% if (securityLevel >= loginHandler.DBA) { %>
<% if (loginBean.isLoggedInAtLeast(LoginStatusBean.DBA) { %>
<li><a href="listUsers?home=<%=portal.getPortalId()%>">User accounts</a></li>
<% } %>
</ul>