- Stage reached column now set when rejecting items in My DSpace

- License added to submitted items in Submit servlet


git-svn-id: http://scm.dspace.org/svn/repo/trunk@291 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/src/org/dspace/app/webui/servlet/MyDSpaceServlet.java

@@ -550,11 +550,16 @@ public class MyDSpaceServlet extends DSpaceServlet
         {
             String reason = request.getParameter("reason");
 
-            WorkflowManager.reject(context,
+            WorkspaceItem wsi = WorkflowManager.reject(context,
                 workflowItem,
                 context.getCurrentUser(),
                 reason);
 
+            // Set the "stage_reached" column on the returned workspace item
+            // to the "verify" stage
+            wsi.setStageReached(SubmitServlet.REVIEW_SUBMISSION);
+            wsi.update();
+
             JSPManager.showJSP(request, response,
                 "/mydspace/task-complete.jsp");
             context.complete();

dspace/src/org/dspace/app/webui/servlet/SubmitServlet.java

@@ -77,6 +77,7 @@ import org.dspace.content.WorkspaceItem;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.eperson.EPerson;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.workflow.WorkflowManager;
 
@@ -1482,6 +1483,16 @@ public class SubmitServlet extends DSpaceServlet
                 "accept_license",
                 getSubmissionLogInfo(subInfo)));
 
+            // Add the license to the item
+            Item item = subInfo.submission.getItem();
+            EPerson submitter = context.getCurrentUser();
+
+            // FIXME: Probably need to take this from the form at some point
+            String license = subInfo.submission.getCollection().getLicense();
+            
+            item.licenseGranted(license, submitter);
+
+            // Start the workflow
             WorkflowManager.start(context, (WorkspaceItem) subInfo.submission);
 
             // FIXME: pass in more information about what happens next?