diff --git a/webapp/config/tlds/VitroUtils.tld b/webapp/config/tlds/VitroUtils.tld index 1b4cc369b..1cfd4a585 100644 --- a/webapp/config/tlds/VitroUtils.tld +++ b/webapp/config/tlds/VitroUtils.tld @@ -16,47 +16,15 @@ --> - confirmLoginStatus - Confirm that the user is logged in as required - - Check to see that the user is logged in (optionally at a certain minimum level). - If not, then redirect them to the login page, with the current request stored as - a post-login destination. - - If "level" is specified, then the user must be logged in at least at that level - in order to avoid being redirected. "level" may be a String like "DBA" or "EDITOR", - or it may be an integer like 50 or 4. - - If "bean" is specified, it is taken as the name of a request attribute where the - LoginStatusBean will be stored. - - edu.cornell.mannlib.vitro.webapp.web.jsptags.ConfirmLoginStatus - empty - - level - false - true - - - allowSelfEditing - false - true - - - bean - false - true - - - - - requiresAuthorizationFor + confirmAuthorization Confirm that the user is authorized for the actions that this page requires. Confirm that the user is authorized to perform all of the RequestedActions that - this page requires. A check is done for each such action, to see whether the - current policy will authorize that action for the current user. If any of the - actions is not authorized, the user will be redirected to the appropriate page. + this page requires. If any of the actions is not authorized, the user will be + redirected to the appropriate page. + + The actions must be found in the "requestedActions" attribute of the request. + The attribute may be a RequestedAction or an array of RequestedActions. If the user is not authorized because he is not logged in, he will be directed to the login page, with the current request stored as a post-login destination. @@ -64,18 +32,9 @@ If the user is logged in but without sufficient authorization, he will be directed to the home page, which will display an "insufficient authorization" message. - - The requested actions are specified as a comma delimited list of class names. - These must be RequestedAction classes, each with a no-argument public - constructor. - edu.cornell.mannlib.vitro.webapp.web.jsptags.RequiresAuthorizationFor + edu.cornell.mannlib.vitro.webapp.web.jsptags.ConfirmAuthorization empty - - classNames - true - true - \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java new file mode 100644 index 000000000..6a3517dd5 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java @@ -0,0 +1,134 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.web.jsptags; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.BodyTagSupport; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import edu.cornell.mannlib.vedit.beans.LoginStatusBean; +import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; +import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; + +/** + * Confirm that the user is authorized to perform each of the RequestedActions. + * + * The user specifies the actions as the "requestedActions" attribute of the + * HTTP request. The attribute must contain either a RequestedAction or an array + * of RequestedActions. + */ +public class ConfirmAuthorization extends BodyTagSupport { + private static final Log log = LogFactory + .getLog(ConfirmAuthorization.class); + + /** + * This is all of it. If they are authorized, continue. Otherwise, redirect. + */ + @Override + public int doEndTag() throws JspException { + if (isAuthorized()) { + return EVAL_PAGE; + } else if (isLoggedIn()) { + return showInsufficientAuthorizationMessage(); + } else { + return redirectToLoginPage(); + } + } + + /** + * They are authorized if the request contains no actions, or if they are + * authorized for the actions it contains. + */ + private boolean isAuthorized() { + Set actionSet = getActionsFromRequestAttribute(); + return PolicyHelper.isAuthorizedForActions(getRequest(), new Actions( + actionSet)); + } + + /** + * The attribute may be either a single RequestedAction or an array of + * RequestedActions. It may also be empty, but in that case why call this + * tag? + * + * When we are done, clear the attribute, so any included or forwarded page + * will not see it. + */ + private Set getActionsFromRequestAttribute() { + Set actionSet = new HashSet(); + Object attribute = getRequest().getAttribute("requestedActions"); + getRequest().removeAttribute("requestedActions"); + + if (attribute == null) { + log.warn(" was called, but nothing " + + "was found at request.getAttribute(\"requestedActions\")"); + } else if (attribute instanceof RequestedAction) { + RequestedAction ra = (RequestedAction) attribute; + log.debug("requested action was " + ra.getClass().getSimpleName()); + actionSet.add(ra); + } else if (attribute instanceof RequestedAction[]) { + RequestedAction[] array = (RequestedAction[]) attribute; + List raList = Arrays.asList(array); + if (log.isDebugEnabled()) { + log.debug("requested actions were " + + formatRequestedActions(raList)); + } + actionSet.addAll(raList); + } else { + throw new IllegalStateException( + "Expected request.getAttribute(\"requestedActions\") " + + "to be either a RequestedAction or a " + + "RequestedAction[], but found " + + attribute.getClass().getCanonicalName()); + } + + return actionSet; + } + + private String formatRequestedActions(List raList) { + StringBuffer buff = new StringBuffer(); + for (Iterator it = raList.iterator(); it.hasNext();) { + buff.append("'").append(it.next().getClass().getSimpleName()) + .append("'"); + if (it.hasNext()) { + buff.append(", "); + } + } + return buff.toString(); + } + + private boolean isLoggedIn() { + return LoginStatusBean.getBean(getRequest()).isLoggedIn(); + } + + private int showInsufficientAuthorizationMessage() { + VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(), + getResponse()); + return SKIP_PAGE; + } + + private int redirectToLoginPage() { + VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse()); + return SKIP_PAGE; + } + + private HttpServletRequest getRequest() { + return ((HttpServletRequest) pageContext.getRequest()); + } + + private HttpServletResponse getResponse() { + return (HttpServletResponse) pageContext.getResponse(); + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmLoginStatus.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmLoginStatus.java deleted file mode 100644 index 1a83cff66..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmLoginStatus.java +++ /dev/null @@ -1,115 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.web.jsptags; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTagSupport; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vedit.beans.LoginStatusBean; -import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; -import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LogoutRedirector; -import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep; - -/** - * TODO This should go away as it is replaced by vitro:requiresAuthorizationFor - */ -public class ConfirmLoginStatus extends BodyTagSupport { - private static final Log log = LogFactory.getLog(ConfirmLoginStatus.class); - - int level = LoginStatusBean.NON_EDITOR; - boolean allowSelfEditing; - String beanAttributeName; - - public String getLevel() { - return String.valueOf(level); - } - - public void setLevel(String levelString) { - if ("DBA".equals(levelString)) { - this.level = LoginStatusBean.DBA; - } else if ("CURATOR".equals(levelString)) { - this.level = LoginStatusBean.CURATOR; - } else if ("EDITOR".equals(levelString)) { - this.level = LoginStatusBean.EDITOR; - } else if ("NON_EDITOR".equals(levelString)) { - this.level = LoginStatusBean.NON_EDITOR; - } else { - throw new IllegalArgumentException("Level attribute '" - + levelString + "' is not valid."); - } - } - - public void setAllowSelfEditing(boolean allowSelfEditing) { - this.allowSelfEditing = allowSelfEditing; - } - - public boolean getAllowSelfEditing() { - return this.allowSelfEditing; - } - - public String getBean() { - return this.beanAttributeName; - } - - public void setbean(String beanAttributeName) { - this.beanAttributeName = beanAttributeName; - } - - @Override - public int doEndTag() throws JspException { - LogoutRedirector.recordRestrictedPageUri(getRequest()); - - LoginStatusBean loginBean = LoginStatusBean.getBean(getRequest()); - boolean isLoggedIn = loginBean.isLoggedIn(); - boolean isSufficient = loginBean.isLoggedInAtLeast(level); - - boolean isSelfEditing = VitroRequestPrep.isSelfEditing(getRequest()); - - log.debug("loginLevel=" + loginBean.getSecurityLevel() - + ", requiredLevel=" + level + ", selfEditingAllowed=" - + allowSelfEditing + ", isSelfEditing=" + isSelfEditing); - - if (isSufficient || (allowSelfEditing && isSelfEditing)) { - log.debug("Login status confirmed."); - return setBeanAndReturn(loginBean); - } else if (isLoggedIn) { - log.debug("Logged in, but not sufficient."); - return showInsufficientAuthorizationMessage(); - } else { - log.debug("Login status not confirmed."); - return redirectAndSkipPage(); - } - - } - - private int setBeanAndReturn(LoginStatusBean loginBean) { - if (beanAttributeName != null) { - getRequest().setAttribute(beanAttributeName, loginBean); - } - return EVAL_PAGE; - } - - private int showInsufficientAuthorizationMessage() { - VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(), - getResponse()); - return SKIP_PAGE; - } - - private int redirectAndSkipPage() throws JspException { - VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse()); - return SKIP_PAGE; - } - - private HttpServletRequest getRequest() { - return ((HttpServletRequest) pageContext.getRequest()); - } - - private HttpServletResponse getResponse() { - return (HttpServletResponse) pageContext.getResponse(); - } -} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/RequiresAuthorizationFor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/RequiresAuthorizationFor.java deleted file mode 100644 index 95218443b..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/RequiresAuthorizationFor.java +++ /dev/null @@ -1,151 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.web.jsptags; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.BodyTagSupport; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vedit.beans.LoginStatusBean; -import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; - -/** - * Confirm that the user is authorized to perform each of the RequestedActions. - * - * The user specifies the actions as a comma delimited list of class names (with - * optional spaces). The classes named must be extensions of RequestedAction - * (usually implementations of UsePagesRequestedAction), and each class must - * have a no-argument public constructor. - */ -public class RequiresAuthorizationFor extends BodyTagSupport { - private static final Log log = LogFactory - .getLog(RequiresAuthorizationFor.class); - - String classNamesString = ""; - - public void setClassNames(String classNamesString) { - this.classNamesString = classNamesString; - } - - /** - * This is all of it. If they are authorized, continue. Otherwise, redirect. - */ - @Override - public int doEndTag() throws JspException { - if (isAuthorized()) { - return EVAL_PAGE; - } else if (isLoggedIn()) { - return showInsufficientAuthorizationMessage(); - } else { - return redirectToLoginPage(); - } - } - - /** - * They are authorized if we recognize the actions they ask for, and they - * are authorized for those actions. - */ - private boolean isAuthorized() { - Set> classes = instantiateActionClasses(); - if (classes == null) { - return false; - } - Set actionSet = getInstancesFromClasses(classes); - return PolicyHelper.isAuthorizedForActions(getRequest(), new Actions(actionSet)); - } - - /** - * Break the string into class names. Confirm that each class is - * RequestedAction or a subclass of it. Create an instance of each class. - * - * If we can't do all of that, complain and return null. - */ - private Set> instantiateActionClasses() { - Set classNames = parseClassNames(); - if (classNames.isEmpty()) { - return Collections.emptySet(); - } - - return loadClassesAndCheckTypes(classNames); - } - - private Set parseClassNames() { - Set names = new HashSet(); - for (String part : classNamesString.split("[\\s],[\\s]")) { - String name = part.trim(); - if (!name.isEmpty()) { - names.add(name); - } - } - return names; - } - - private Set> loadClassesAndCheckTypes( - Set classNames) { - Set> classes = new HashSet>(); - for (String className : classNames) { - try { - Class clazz = Class.forName(className); - classes.add(clazz.asSubclass(RequestedAction.class)); - } catch (ClassNotFoundException e) { - log.error("Can't load action class: '" + className + "'"); - return null; - } catch (ClassCastException e) { - log.error("Action class is not a subclass of RequestedAction: '" - + className + "'"); - return null; - } - } - return classes; - } - - private Set getInstancesFromClasses( - Set> actionClasses) { - Set actions = new HashSet(); - for (Class actionClass : actionClasses) { - try { - RequestedAction action = actionClass.newInstance(); - actions.add(action); - } catch (Exception e) { - log.error("Failed to create an instance of '" - + actionClass.getName() - + "'. Does it have a public zero-argument constructor?"); - } - } - return actions; - } - - private boolean isLoggedIn() { - return LoginStatusBean.getBean(getRequest()).isLoggedIn(); - } - - private int showInsufficientAuthorizationMessage() { - VitroHttpServlet.redirectToInsufficientAuthorizationPage(getRequest(), - getResponse()); - return SKIP_PAGE; - } - - private int redirectToLoginPage() { - VitroHttpServlet.redirectToLoginPage(getRequest(), getResponse()); - return SKIP_PAGE; - } - - private HttpServletRequest getRequest() { - return ((HttpServletRequest) pageContext.getRequest()); - } - - private HttpServletResponse getResponse() { - return (HttpServletResponse) pageContext.getResponse(); - } -} diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp index 976c9bcf0..e319337e1 100644 --- a/webapp/web/admin/conceptRepair.jsp +++ b/webapp/web/admin/conceptRepair.jsp @@ -4,9 +4,11 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %> + - <% String conceptIdStr = request.getParameter("conceptId"); diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp index 3ec8995d1..5f58f0694 100644 --- a/webapp/web/admin/gotoIndividual.jsp +++ b/webapp/web/admin/gotoIndividual.jsp @@ -4,9 +4,11 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %> + <% if( request.getParameter("uri") != null ){ diff --git a/webapp/web/admin/log4j.jsp b/webapp/web/admin/log4j.jsp index 60d10fce8..f0136f9df 100644 --- a/webapp/web/admin/log4j.jsp +++ b/webapp/web/admin/log4j.jsp @@ -12,9 +12,10 @@ Brian Cauros bdc34@cornell.edu based on work by Volker Mentzner. --%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %> + <% try { diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp index cde796d42..0b7c7f254 100644 --- a/webapp/web/admin/removeBadRestrictions.jsp +++ b/webapp/web/admin/removeBadRestrictions.jsp @@ -1,9 +1,11 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %> + <% if (request.getParameter("execute") != null) { diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp index 678f5b7e9..05567853c 100644 --- a/webapp/web/admin/removeResourceDescription.jsp +++ b/webapp/web/admin/removeResourceDescription.jsp @@ -3,9 +3,11 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousCuratorPages()); %> + <% String resourceURIStr = request.getParameter("resourceURI"); diff --git a/webapp/web/admin/showids.jsp b/webapp/web/admin/showids.jsp index 602464c43..27dab498c 100644 --- a/webapp/web/admin/showids.jsp +++ b/webapp/web/admin/showids.jsp @@ -5,7 +5,7 @@ <%@page import="java.util.List"%> -<%-- doesn't use vitro:requiresAuthorizationFor becuase the we want to be able to see IDs for any user. --%> +<%-- doesn't use vitro:confirmAuthorization becuase the we want to be able to see IDs for any user. --%> <%-- uses "security through obscurity", and doesn't give away much information. --%> <% diff --git a/webapp/web/admin/sparql.jsp b/webapp/web/admin/sparql.jsp index 4b5c3066d..7b5579cc6 100644 --- a/webapp/web/admin/sparql.jsp +++ b/webapp/web/admin/sparql.jsp @@ -4,8 +4,10 @@ <%@page import="java.util.ArrayList"%> <%@page import="java.util.List"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + diff --git a/webapp/web/admin/sparqlquery/sparqlForm.jsp b/webapp/web/admin/sparqlquery/sparqlForm.jsp index e92a2a2cf..bc7db5254 100644 --- a/webapp/web/admin/sparqlquery/sparqlForm.jsp +++ b/webapp/web/admin/sparqlquery/sparqlForm.jsp @@ -5,8 +5,10 @@ <%@page import="java.util.ArrayList"%> <%@page import="java.util.List"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %> +<% request.setAttribute("requestedActions", new ManagePortals()); %> +
diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp index b3ce96d69..35738085f 100644 --- a/webapp/web/admin/syncSesame.jsp +++ b/webapp/web/admin/syncSesame.jsp @@ -12,9 +12,11 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousAdminPages()); %> + <%! diff --git a/webapp/web/edit/editDatapropStmtRequestDispatch.jsp b/webapp/web/edit/editDatapropStmtRequestDispatch.jsp index 818e3ea02..9c55f0b02 100644 --- a/webapp/web/edit/editDatapropStmtRequestDispatch.jsp +++ b/webapp/web/edit/editDatapropStmtRequestDispatch.jsp @@ -16,14 +16,16 @@ <%@ page import="java.util.HashMap" %> <%@ page import="org.apache.commons.logging.Log" %> <%@ page import="org.apache.commons.logging.LogFactory" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <% //org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editDatapropStmtRequestDispatch.jsp"); final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editDatapropStmtRequestDispatch.jsp"); %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% // Decide which form to forward to, set subjectUri, subjectUriJson, predicateUri, predicateUriJson in request diff --git a/webapp/web/edit/editRequestDispatch.jsp b/webapp/web/edit/editRequestDispatch.jsp index 092a3588e..802137298 100644 --- a/webapp/web/edit/editRequestDispatch.jsp +++ b/webapp/web/edit/editRequestDispatch.jsp @@ -14,13 +14,15 @@ <%@ page import="org.apache.commons.logging.LogFactory" %> <%@ page errorPage="/error.jsp" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%! public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.editRequestDispatch.jsp"); %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% /* diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp index 211f64822..1d655e9b4 100644 --- a/webapp/web/edit/forms/datapropStmtDelete.jsp +++ b/webapp/web/edit/forms/datapropStmtDelete.jsp @@ -22,9 +22,11 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jstl/functions" %> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("edu.cornell.mannlib.vitro.jsp.edit.forms.datapropStmtDelete"); diff --git a/webapp/web/edit/forms/propDelete.jsp b/webapp/web/edit/forms/propDelete.jsp index 985ac5b37..fbf0f1527 100644 --- a/webapp/web/edit/forms/propDelete.jsp +++ b/webapp/web/edit/forms/propDelete.jsp @@ -37,9 +37,11 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jstl/functions" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <%! public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.propDelete.jsp"); diff --git a/webapp/web/edit/messages/datapropertyBackButtonProblems.jsp b/webapp/web/edit/messages/datapropertyBackButtonProblems.jsp index a4dc67718..6db24c055 100644 --- a/webapp/web/edit/messages/datapropertyBackButtonProblems.jsp +++ b/webapp/web/edit/messages/datapropertyBackButtonProblems.jsp @@ -24,7 +24,6 @@ <%@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 @@ -42,7 +41,10 @@ and set a flag in the request to indicate "back button confusion" log.debug("Starting datapropertyBackButtonProblems.jsp"); %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% List errorMessages = new ArrayList(); diff --git a/webapp/web/edit/n3Delete.jsp b/webapp/web/edit/n3Delete.jsp index 7f74b88c6..7c413fd5d 100644 --- a/webapp/web/edit/n3Delete.jsp +++ b/webapp/web/edit/n3Delete.jsp @@ -37,7 +37,6 @@ <%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%-- N3 based deletion. @@ -48,7 +47,10 @@ --%> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% /* the post parameters seem to get consumed by the parsing so diff --git a/webapp/web/edit/processDatapropRdfForm.jsp b/webapp/web/edit/processDatapropRdfForm.jsp index a7da77c27..837a7bc75 100644 --- a/webapp/web/edit/processDatapropRdfForm.jsp +++ b/webapp/web/edit/processDatapropRdfForm.jsp @@ -29,7 +29,6 @@ <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent"%> <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%-- 2nd prototype of processing, adapted for data property editing @@ -61,11 +60,13 @@ and set a flag in the request to indicate "back button confusion" --%> <%! - final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.processDatapropRdfForm.jsp"); %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% log.debug("Starting processDatapropRdfForm.jsp"); diff --git a/webapp/web/edit/processRdfForm2.jsp b/webapp/web/edit/processRdfForm2.jsp index 58ba4746e..dde36eb75 100644 --- a/webapp/web/edit/processRdfForm2.jsp +++ b/webapp/web/edit/processRdfForm2.jsp @@ -47,7 +47,6 @@ <%@page import="edu.cornell.mannlib.vitro.webapp.dao.InsertException"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%-- 2nd prototype of processing. @@ -58,7 +57,10 @@ The optional n3 blocks will proccessed if their variables are bound and are well formed. --%> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousPages" %> +<% request.setAttribute("requestedActions", new UseMiscellaneousPages()); %> + <% VitroRequest vreq = new VitroRequest(request); diff --git a/webapp/web/jenaIngest/connectDB.jsp b/webapp/web/jenaIngest/connectDB.jsp index 2525fbd43..3f655d860 100644 --- a/webapp/web/jenaIngest/connectDB.jsp +++ b/webapp/web/jenaIngest/connectDB.jsp @@ -1,9 +1,12 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + + <%@page import="java.util.List"%>

Ingest Menu > Connect to Jena Database

diff --git a/webapp/web/jenaIngest/createModel.jsp b/webapp/web/jenaIngest/createModel.jsp index 7eb34a330..154485119 100644 --- a/webapp/web/jenaIngest/createModel.jsp +++ b/webapp/web/jenaIngest/createModel.jsp @@ -1,7 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> +

Ingest Menu > Create New Model

diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp index 93573b79d..41f7f0657 100644 --- a/webapp/web/jenaIngest/csv2rdf.jsp +++ b/webapp/web/jenaIngest/csv2rdf.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp index 77f31d4fd..9de19e4dd 100644 --- a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp +++ b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp @@ -12,8 +12,11 @@ <%@ page import="java.util.HashMap" %> <%@ page import="java.util.Set" %> <%@ page import="java.util.Map.Entry" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp index 6196c158a..a6a1e68fe 100644 --- a/webapp/web/jenaIngest/executeWorkflow.jsp +++ b/webapp/web/jenaIngest/executeWorkflow.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/generateTBox.jsp b/webapp/web/jenaIngest/generateTBox.jsp index d36398967..53ff8bfcd 100644 --- a/webapp/web/jenaIngest/generateTBox.jsp +++ b/webapp/web/jenaIngest/generateTBox.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/ingestMenu.jsp b/webapp/web/jenaIngest/ingestMenu.jsp index 6a91aee6e..faca59502 100644 --- a/webapp/web/jenaIngest/ingestMenu.jsp +++ b/webapp/web/jenaIngest/ingestMenu.jsp @@ -1,7 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> +

Ingest Menu

diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp index ef24ba2d3..2e3e4802e 100644 --- a/webapp/web/jenaIngest/listModels.jsp +++ b/webapp/web/jenaIngest/listModels.jsp @@ -4,8 +4,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + diff --git a/webapp/web/jenaIngest/renameResult.jsp b/webapp/web/jenaIngest/renameResult.jsp index 9ce188245..0a972c3ab 100644 --- a/webapp/web/jenaIngest/renameResult.jsp +++ b/webapp/web/jenaIngest/renameResult.jsp @@ -1,8 +1,11 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> +

Ingest Menu > Rename Resource

diff --git a/webapp/web/jenaIngest/smushSingleModel.jsp b/webapp/web/jenaIngest/smushSingleModel.jsp index 42bc56ad7..1509ec2be 100644 --- a/webapp/web/jenaIngest/smushSingleModel.jsp +++ b/webapp/web/jenaIngest/smushSingleModel.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp index 02547d154..8651819f0 100644 --- a/webapp/web/jenaIngest/sparqlConstruct.jsp +++ b/webapp/web/jenaIngest/sparqlConstruct.jsp @@ -9,8 +9,11 @@ <%@ page import="java.net.URLEncoder"%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/splitPropertyValues.jsp b/webapp/web/jenaIngest/splitPropertyValues.jsp index 4e07b7c7d..8bf1dbe6c 100644 --- a/webapp/web/jenaIngest/splitPropertyValues.jsp +++ b/webapp/web/jenaIngest/splitPropertyValues.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/subtractModels.jsp b/webapp/web/jenaIngest/subtractModels.jsp index 0f5b24fdc..888579056 100644 --- a/webapp/web/jenaIngest/subtractModels.jsp +++ b/webapp/web/jenaIngest/subtractModels.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/workflowStep.jsp b/webapp/web/jenaIngest/workflowStep.jsp index fb591044f..f78b791c3 100644 --- a/webapp/web/jenaIngest/workflowStep.jsp +++ b/webapp/web/jenaIngest/workflowStep.jsp @@ -7,8 +7,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/xmlFileUpload.jsp b/webapp/web/jenaIngest/xmlFileUpload.jsp index 44b5ae687..3aafaff0e 100644 --- a/webapp/web/jenaIngest/xmlFileUpload.jsp +++ b/webapp/web/jenaIngest/xmlFileUpload.jsp @@ -4,8 +4,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> + <% diff --git a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp index e6dcf5af6..5556da354 100644 --- a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp +++ b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp @@ -4,8 +4,11 @@ <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> +

Uploaded XML files and converted to RDF.

Loaded <%= request.getAttribute("statementCount") %> statements to the model <%= request.getAttribute("targetModel") %>.

diff --git a/webapp/web/templates/edit/specific/portal_retry.jsp b/webapp/web/templates/edit/specific/portal_retry.jsp index 301b5c314..dea28c125 100644 --- a/webapp/web/templates/edit/specific/portal_retry.jsp +++ b/webapp/web/templates/edit/specific/portal_retry.jsp @@ -4,8 +4,11 @@ <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals" %> +<% request.setAttribute("requestedActions", new ManagePortals()); %> + diff --git a/webapp/web/templates/edit/specific/tabs2tabs_retry.jsp b/webapp/web/templates/edit/specific/tabs2tabs_retry.jsp index 1a8406a57..93e5712a2 100644 --- a/webapp/web/templates/edit/specific/tabs2tabs_retry.jsp +++ b/webapp/web/templates/edit/specific/tabs2tabs_retry.jsp @@ -2,8 +2,11 @@ <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" %> +<% request.setAttribute("requestedActions", new ManageTabs()); %> +
diff --git a/webapp/web/templates/edit/specific/tabs_edit.jsp b/webapp/web/templates/edit/specific/tabs_edit.jsp index 2a2e12270..018526b46 100644 --- a/webapp/web/templates/edit/specific/tabs_edit.jsp +++ b/webapp/web/templates/edit/specific/tabs_edit.jsp @@ -2,8 +2,12 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs" %> +<% request.setAttribute("requestedActions", new ManageTabs()); %> + +
diff --git a/webapp/web/templates/edit/specific/upload_rdf.jsp b/webapp/web/templates/edit/specific/upload_rdf.jsp index 511ae5b98..1c75e150d 100644 --- a/webapp/web/templates/edit/specific/upload_rdf.jsp +++ b/webapp/web/templates/edit/specific/upload_rdf.jsp @@ -1,8 +1,11 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - + +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %> +<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %> +
diff --git a/webapp/web/templates/edit/specific/user_edit.jsp b/webapp/web/templates/edit/specific/user_edit.jsp index 8532d2987..70a431026 100644 --- a/webapp/web/templates/edit/specific/user_edit.jsp +++ b/webapp/web/templates/edit/specific/user_edit.jsp @@ -6,8 +6,11 @@ -<%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> - +<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts" %> +<% request.setAttribute("requestedActions", new ManageUserAccounts()); %> + +