From dad5b325e1da4c33fe6e64859726336974895aeb Mon Sep 17 00:00:00 2001 From: philip Vissenaekens Date: Tue, 17 May 2016 16:42:31 +0200 Subject: [PATCH 1/4] DS-3146 --- .../step/JSPStartSubmissionLookupStep.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java index d244a405ef..6aed4d3fee 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java @@ -79,6 +79,8 @@ public class JSPStartSubmissionLookupStep extends JSPStep private CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService(); + private final String DEFAULT_COLLECTION_ID = "-1"; + /** * Do any pre-processing to determine which JSP (if any) is used to generate * the UI for this step. This method should include the gathering and @@ -124,8 +126,15 @@ public class JSPStartSubmissionLookupStep extends JSPStep * With no parameters, this servlet prepares for display of the Select * Collection JSP. */ - UUID collection_id = UIUtil.getUUIDParameter(request, "collection"); - UUID collectionID = UIUtil.getUUIDParameter(request, "collectionid"); + UUID collection_id = null; + if(!DEFAULT_COLLECTION_ID.equals(request.getParameter("collection"))) { + collection_id = UIUtil.getUUIDParameter(request, "collection"); + } + + UUID collectionID = null; + if(!DEFAULT_COLLECTION_ID.equals(request.getParameter("collectionid"))) { + collectionID = UIUtil.getUUIDParameter(request, "collectionid"); + } Collection col = null; if (collectionID != null) @@ -162,7 +171,13 @@ public class JSPStartSubmissionLookupStep extends JSPStep // save collections to request for JSP request.setAttribute("collections", collections); - request.setAttribute("collection_id", collection_id); + + if(collection_id!=null) { + request.setAttribute("collection_id", collection_id); + } + else { + request.setAttribute("collection_id", DEFAULT_COLLECTION_ID); + } request.setAttribute("collectionID", collectionID); Map> identifiers2providers = slService From 1aa496f20d15b407737c79fe523d03eb3032f0aa Mon Sep 17 00:00:00 2001 From: philip Vissenaekens Date: Tue, 31 May 2016 14:28:58 +0200 Subject: [PATCH 2/4] DS-3146 --- .../webapp/submit/start-lookup-submission.jsp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dspace-jspui/src/main/webapp/submit/start-lookup-submission.jsp b/dspace-jspui/src/main/webapp/submit/start-lookup-submission.jsp index e292d85a7a..69eba0628a 100644 --- a/dspace-jspui/src/main/webapp/submit/start-lookup-submission.jsp +++ b/dspace-jspui/src/main/webapp/submit/start-lookup-submission.jsp @@ -23,8 +23,7 @@ <%@ page import="org.dspace.content.Collection" %> <%@ page import="java.lang.Boolean" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Map" %> +<%@ page import="java.util.*" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -42,8 +41,18 @@ (List) request.getAttribute("collections"); //get collection id from the collection home - String collection_id = (String) request.getAttribute("collection_id"); - + Object collection_id_object = request.getAttribute("collection_id"); + + String collection_id; + + if(collection_id_object instanceof UUID){ + UUID uuid = (UUID) collection_id_object; + collection_id = uuid.toString(); + } + else { + collection_id = (String) collection_id_object; + } + //check if we need to display the "no collection selected" error Boolean noCollection = (Boolean) request.getAttribute("no.collection"); Boolean nosuuid = (Boolean) request.getAttribute("nouuid"); From 5c68166241b2d59f151deabf1f902719044c1358 Mon Sep 17 00:00:00 2001 From: philip Vissenaekens Date: Thu, 30 Jun 2016 17:58:51 +0200 Subject: [PATCH 3/4] DS-3146 --- .../submit/step/StartSubmissionLookupStep.java | 2 +- .../submit/step/JSPStartSubmissionLookupStep.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java b/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java index 2d331abdec..eda6bbbc52 100644 --- a/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java +++ b/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java @@ -120,7 +120,7 @@ public class StartSubmissionLookupStep extends AbstractProcessingStep AuthorizeException { // First we find the collection which was selected - UUID id = Util.getUUIDParameter(request, "collectionid"); + UUID id = Util.getUUIDParameter(request, "collection"); String titolo = request.getParameter("search_title"); String date = request.getParameter("search_year"); String autori = request.getParameter("search_authors"); diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java index 6aed4d3fee..4c151357d7 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/submit/step/JSPStartSubmissionLookupStep.java @@ -131,15 +131,14 @@ public class JSPStartSubmissionLookupStep extends JSPStep collection_id = UIUtil.getUUIDParameter(request, "collection"); } - UUID collectionID = null; - if(!DEFAULT_COLLECTION_ID.equals(request.getParameter("collectionid"))) { - collectionID = UIUtil.getUUIDParameter(request, "collectionid"); + if(collection_id == null && !DEFAULT_COLLECTION_ID.equals(request.getParameter("collectionid"))) { + collection_id = UIUtil.getUUIDParameter(request, "collectionid"); } Collection col = null; - if (collectionID != null) + if (collection_id != null) { - col = collectionService.find(context, collectionID); + col = collectionService.find(context, collection_id); } // if we already have a valid collection, then we can forward directly @@ -147,7 +146,7 @@ public class JSPStartSubmissionLookupStep extends JSPStep if (col != null) { log.debug("Select Collection page skipped, since a Collection ID was already found. Collection ID=" - + collectionID); + + collection_id); } else { @@ -178,7 +177,7 @@ public class JSPStartSubmissionLookupStep extends JSPStep else { request.setAttribute("collection_id", DEFAULT_COLLECTION_ID); } - request.setAttribute("collectionID", collectionID); + request.setAttribute("collectionID", collection_id); Map> identifiers2providers = slService .getProvidersIdentifiersMap(); From d88b37055aabd0934966dba3916fdbcfcf362598 Mon Sep 17 00:00:00 2001 From: philip Vissenaekens Date: Tue, 5 Jul 2016 12:01:50 +0200 Subject: [PATCH 4/4] DS-3146 --- .../java/org/dspace/submit/step/StartSubmissionLookupStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java b/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java index eda6bbbc52..2d331abdec 100644 --- a/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java +++ b/dspace-api/src/main/java/org/dspace/submit/step/StartSubmissionLookupStep.java @@ -120,7 +120,7 @@ public class StartSubmissionLookupStep extends AbstractProcessingStep AuthorizeException { // First we find the collection which was selected - UUID id = Util.getUUIDParameter(request, "collection"); + UUID id = Util.getUUIDParameter(request, "collectionid"); String titolo = request.getParameter("search_title"); String date = request.getParameter("search_year"); String autori = request.getParameter("search_authors");