diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/BatchImportServlet.java b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/BatchImportServlet.java index 411ae95691..0eef09f159 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/BatchImportServlet.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/BatchImportServlet.java @@ -101,6 +101,12 @@ public class BatchImportServlet extends DSpaceServlet List inputTypes =dls.getFileDataLoaders(); request.setAttribute("input-types", inputTypes); + if (reqCollectionsTmp!=null) + request.setAttribute("otherCollections", reqCollectionsTmp); + if (owningCollection!=null) + request.setAttribute("owningCollection", owningCollection.getID()); + request.setAttribute("inputType", inputType); + File f = null; String zipurl = null; diff --git a/dspace-jspui/src/main/webapp/dspace-admin/batchimport.jsp b/dspace-jspui/src/main/webapp/dspace-admin/batchimport.jsp index ed791d729e..36a99fb8dc 100644 --- a/dspace-jspui/src/main/webapp/dspace-admin/batchimport.jsp +++ b/dspace-jspui/src/main/webapp/dspace-admin/batchimport.jsp @@ -18,6 +18,7 @@ <%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %> <%@ page import="java.util.List" %> +<%@ page import="java.util.ArrayList" %> <%@ page import="org.dspace.content.Collection" %> <% @@ -31,6 +32,20 @@ String message = (String)request.getAttribute("message"); + List otherCollections = new ArrayList(); + if (request.getAttribute("otherCollections")!=null) { + otherCollections = (List)request.getAttribute("otherCollections"); + } + + Integer owningCollectionID = null; + if (request.getAttribute("owningCollection")!=null){ + owningCollectionID = (Integer)request.getAttribute("owningCollection"); + } + + String selectedInputType = null; + if (request.getAttribute("inputType")!=null){ + selectedInputType = (String)request.getAttribute("inputType"); + } %> @@ -112,21 +132,24 @@ <% for (Collection collection : collections){ + String selected = ((owningCollectionID != null) && (owningCollectionID == collection.getID())) ? "selected" : ""; %> - + <% } %> -