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

NIHVIVO-736 Modify JSPs to use the <vitro:confirmLoginStatus> custom JSP tag.

Browse source
This commit is contained in:
jeb228 2010-10-14 19:10:21 +00:00
parent 0bd050a78b
commit 66559f58ab
16 changed files with 68 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/edit/messages/datapropertyBackButtonProblems.jsp
View file

@ -5,7 +5,6 @@
<%@ page import="com.hp.hpl.jena.shared.Lock" %>
<%@ page import="com.thoughtworks.xstream.XStream" %>
<%@ page import="com.thoughtworks.xstream.io.xml.DomDriver" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>
@ -25,6 +24,7 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.RdfLiteralHash"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.beans.DataProperty"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%--
Current stop gap solution for back button problems
@ -41,11 +41,10 @@ and set a flag in the request to indicate "back button confusion"
<%
log.debug("Starting datapropertyBackButtonProblems.jsp");
%>
<%
if (!VitroRequestPrep.isSelfEditing(request) && !LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
%><c:redirect url="<%= Controllers.LOGIN %>" /><%
}
<vitro:confirmLoginStatus level="CURATOR" allowSelfEditing="true" />
<%
List<String> errorMessages = new ArrayList<String>();
Object sessionOntModel = request.getSession().getAttribute("jenaOntModel");
OntModel jenaOntModel = (sessionOntModel != null && sessionOntModel instanceof OntModel) ? (OntModel)sessionOntModel: