[DS-83] Hardcoded behaviour of Initial question step in the submission

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3596 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/submit/step/SkipInitialQuestionsStep.java

@@ -0,0 +1,96 @@
+/*
+ * SampleStep.java
+ *
+ * Version: $Revision$
+ *
+ * Date: $Date$
+ *
+ * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
+ * Institute of Technology.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Hewlett-Packard Company nor the name of the
+ * Massachusetts Institute of Technology nor the names of their
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+package org.dspace.submit.step;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.dspace.app.util.SubmissionInfo;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.core.Context;
+import org.dspace.submit.AbstractProcessingStep;
+
+/**
+ * This is a Simple Step class that need to be used when you want skip the
+ * initial questions step!
+ * <p>
+ * At the moment this step is required because part of the behaviour of the
+ * InitialQuestionStep is required to be managed also in the DescribeStep (see
+ * JIRA [DS-83] Hardcoded behaviour of Initial question step in the submission)
+ * </p>
+ * 
+ * @see org.dspace.submit.AbstractProcessingStep
+ * @see org.dspace.submit.step.InitialQuestionStep
+ * @see org.dspace.submit.step.DescribeStep
+ * 
+ * @author Andrea Bollini
+ * @version $Revision$
+ */
+public class SkipInitialQuestionsStep extends AbstractProcessingStep
+{
+    /**
+     * Simply we flags the submission as the user had checked both multi-title,
+     * multi-files and published before so that the input-form configuration
+     * will be used as is
+     */
+    public int doProcessing(Context context, HttpServletRequest request,
+            HttpServletResponse response, SubmissionInfo subInfo)
+            throws ServletException, IOException, SQLException,
+            AuthorizeException
+    {
+        InProgressSubmission submissionItem = subInfo.getSubmissionItem();
+        submissionItem.setMultipleFiles(true);
+        submissionItem.setMultipleTitles(true);
+        submissionItem.setPublishedBefore(true);
+        submissionItem.update();
+        return STATUS_COMPLETE;
+    }
+
+    public int getNumberOfPages(HttpServletRequest request,
+            SubmissionInfo subInfo) throws ServletException
+    {
+        return 1;
+    }
+}

dspace/CHANGES

@@ -86,6 +86,7 @@
  - [DS-61] IP Authentication only works on logged in users - ID: 2088431
  - [DS-90] Workflow doesn't skipped if the wf group contains empty subgroups
  - [DS-64] xmlui selection of authentication method - ID: 2086673
+ - [DS-83] Hardcoded behaviour of Initial question step in the submission
  
 (Paulo Jobim)
  - SF Patch [2655052] Authors re-ordered when item edited (xmlui)

dspace/config/item-submission.xml

@@ -180,8 +180,17 @@
 		<jspui-binding>org.dspace.app.webui.submit.step.JSPInitialQuestionsStep</jspui-binding>   	    
 		<xmlui-binding>org.dspace.app.xmlui.aspect.submission.submit.InitialQuestionsStep</xmlui-binding>
 	    <workflow-editable>true</workflow-editable>
-	  </step>  
-          
+	  </step>
+	
+	<!--If you disable the initial questions step you should insert the -->
+	<!--SkipInitialQuestionsStep below, to enable proper processing of  -->
+	<!--input-forms configuration                                       -->
+	
+	<step>
+		<processing-class>org.dspace.submit.step.SkipInitialQuestionsStep</processing-class>
+	</step>
+    -->  
+      
       <!--Step 2 will be to Describe the item.-->
       <step>
         <heading>submit.progressbar.describe</heading>