hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

when batch import fails, pass to JSP the old values in order to display them again

Browse Source
This commit is contained in:
Kostas Stamatis
2014-12-01 13:40:27 +02:00
parent b36b0f262a
commit 2f026f3544
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-jspui/src/main/java/org/dspace/app/webui/servlet/BatchImportServlet.java
View File

@@ -101,6 +101,12 @@ public class BatchImportServlet extends DSpaceServlet
List<String> 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;

35
dspace-jspui/src/main/webapp/dspace-admin/batchimport.jsp
View File

@@ -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<String> otherCollections = new ArrayList<String>();
if (request.getAttribute("otherCollections")!=null) {
otherCollections = (List<String>)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");
}
%>
<dspace:layout style="submission" titlekey="jsp.dspace-admin.batchimport.title"
@@ -77,12 +92,17 @@
<div class="form-group">
<label for="inputType"><fmt:message key="jsp.dspace-admin.batchmetadataimport.selectinputfile"/></label>
<select class="form-control" name="inputType" id="import-type">
<option value="safupload"><fmt:message key="jsp.dspace-admin.batchimport.saf.upload"/></option>
<option value="saf"><fmt:message key="jsp.dspace-admin.batchimport.saf.remote"/></option>
<%
String safuploadSelected = selectedInputType.equals("safupload") ? "selected" : "";
String safSelected = selectedInputType.equals("saf") ? "selected" : "";
%>
<option <%= safuploadSelected %> value="safupload"><fmt:message key="jsp.dspace-admin.batchimport.saf.upload"/></option>
<option <%= safSelected %> value="saf"><fmt:message key="jsp.dspace-admin.batchimport.saf.remote"/></option>
<%
for (String inputType : inputTypes){
String selected = selectedInputType.equals(inputType) ? "selected" : "";
%>
<option value="<%= inputType %>"><%= inputType %></option>
<option <%= selected %> value="<%= inputType %>"><%= inputType %></option>
<%
}
%> </select>
@@ -112,21 +132,24 @@
<option value="-1"><fmt:message key="jsp.dspace-admin.batchmetadataimport.select"/></option>
<%
for (Collection collection : collections){
String selected = ((owningCollectionID != null) && (owningCollectionID == collection.getID())) ? "selected" : "";
%>
<option value="<%= collection.getID() %>"><%= collection.getName() %></option>
<option <%= selected %> value="<%= collection.getID() %>"><%= collection.getName() %></option>
<%
}
%>
</select>
</div>
<div class="form-group" id="other-collections-div" style="display:none">
<% String displayValue = owningCollectionID != null ? "display:block" : "display:none"; %>
<div class="form-group" id="other-collections-div" style="<%= displayValue %>">
<label for="collection"><fmt:message key="jsp.dspace-admin.batchmetadataimport.selectothercollections"/></label>
<select class="form-control" name="collections" multiple style="height:150px" id="other-collections-select">
<%
for (Collection collection : collections){
String selected = ((otherCollections != null) && (otherCollections.contains(""+collection.getID()))) ? "selected" : "";
%>
<option value="<%= collection.getID() %>"><%= collection.getName() %></option>
<option <%= selected %> value="<%= collection.getID() %>"><%= collection.getName() %></option>
<%
}
%>