Fix to Bug #2015988 - Configurable Submission bug in SubmissionController

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3022 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Tim Donohue
2008-07-31 20:58:42 +00:00
parent 0ee9d6b926
commit 8d93f1d810

View File

@@ -126,10 +126,11 @@ public class SubmissionController extends DSpaceServlet
/** Selection collection step */ /** Selection collection step */
public static final int SELECT_COLLECTION = 0; public static final int SELECT_COLLECTION = 0;
public static final int BEFORE_FIRST_STEP = 0;
/** First step after "select collection" */ /** First step after "select collection" */
public static int FIRST_STEP = 1; public static final int FIRST_STEP = 1;
/** For workflows, first step is step #0 (since Select Collection is already filtered out) */
public static final int WORKFLOW_FIRST_STEP = 0;
/** path to the JSP shown once the submission is completed */ /** path to the JSP shown once the submission is completed */
private static String COMPLETE_JSP = "/submit/complete.jsp"; private static String COMPLETE_JSP = "/submit/complete.jsp";
@@ -220,13 +221,9 @@ public class SubmissionController extends DSpaceServlet
//load submission information //load submission information
SubmissionInfo si = SubmissionInfo.load(request, wi); SubmissionInfo si = SubmissionInfo.load(request, wi);
//For workflows, first step is step #0 // start over at beginning of first workflow step
//(since Select Collection is already filtered out)
FIRST_STEP = 0;
// start over at beginning of first step
setBeginningOfStep(request, true); setBeginningOfStep(request, true);
doStep(context, request, response, si, FIRST_STEP); doStep(context, request, response, si, WORKFLOW_FIRST_STEP);
} }
catch (NumberFormatException nfe) catch (NumberFormatException nfe)
{ {