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

Datastar cleanup release - including changes to access permissions review and editing as well as fedora utilities.

Browse source
This commit is contained in:
hjk54 2010-05-14 17:37:55 +00:00
parent e402b03ac9
commit 73172f4f40
9 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/edit/editRequestDispatch.jsp
View file

@ -230,7 +230,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
//case where a form was passed as a http parameter
form = formParam;
}
System.out.println("Edit request dispatch - forwarding to form is " + form);
request.setAttribute("form", form);
%>
<jsp:forward page="/edit/forms/${form}" />

4
webapp/web/edit/processRdfForm2.jsp
View file

@ -41,6 +41,8 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.ModelChangePreprocessor"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ page import="java.net.URLDecoder" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<%-- 2nd prototype of processing.
@ -73,7 +75,7 @@ are well formed.
* we have to make a copy. */
Map <String,String[]> queryParameters = null;
queryParameters = vreq.getParameterMap();
List<String> errorMessages = new ArrayList<String>();
EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,vreq,queryParameters);

3
webapp/web/templates/entity/entityMergedPropsList.jsp
View file

@ -33,6 +33,7 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
ENTITY merged props list
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.entity.entityMergedPropsList.jsp");
%>
@ -59,6 +60,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
throw new Error("Subject individual must be in request scope for entityMergedPropsList.jsp");
}
System.out.println("Entity Merged Props list for " + subject.getURI());
// Nick wants not to use explicit parameters to trigger visibility of a div, but for now we don't just want to always show the 1st one
String openingGroupLocalName = (String) request.getParameter("curgroup");
VitroRequest vreq = new VitroRequest(request);

4
webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
View file

@ -37,7 +37,7 @@
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
ENTITY merged props list ungrouped
<jsp:useBean id="loginHandler" class="edu.cornell.mannlib.vedit.beans.LoginFormBean" scope="session" />
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.entity.entityMergedPropsList.jsp");
@ -58,7 +58,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
if (subject==null) {
throw new Error("Subject individual must be in request scope for dashboardPropsList.jsp");
}
System.out.println("Entity merged props list ungrouped for " + subject.getURI());
// Nick wants not to use explicit parameters to trigger visibility of a div, but for now we don't just want to always show the 1st one
String openingGroupLocalName = (String) request.getParameter("curgroup");
VitroRequest vreq = new VitroRequest(request);