J005 - When saving to draft, going to HT002 should select 'Daft' filter

J007 - When opening a job from the 'create job' flow, going to HT002 should have filter set to 'Open' jobs

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -29,20 +29,27 @@ public class SaveJobFP extends SaveFP
     {
         HttpServletRequest  request =   submission.getRequest();
         Job                 job     =   process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job");
-        Boolean             openJob =   (Boolean) request.getAttribute("openJob");
+        JobStatus           status  =   (JobStatus) request.getAttribute("JobStatus");
         
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
 
+        if(status != null)
+        {
+            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP setting job status to session : ", status );
+
+            request.getSession().setAttribute("JobStatus", status);
+        }
+        
         Job oldJob  = (Job) job.getEarliestBackup();
         
-        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || openJob==Boolean.TRUE))
+        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || status == JobStatus.OPEN))
         {
             job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
             job.setOpenDate(new Date());
             
-            if(openJob==Boolean.TRUE)
+            if(status == JobStatus.OPEN)
             {
-                job.setJobStatus(JobStatus.OPEN);
+                job.setJobStatus(status);
 
                 LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
             }

cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp

@@ -208,6 +208,7 @@
                     <div class="text-center">
                         <oneit:button   value="Save as Draft and go to your jobs"   name="saveJob"  cssClass="btn  btn-primary btn-gray largeBtn"   
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
+                                                                        .mapEntry("JobStatus", JobStatus.DRAFT)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
                                                                         .mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
                                                                         .toMap() %>" />
@@ -215,7 +216,7 @@
                         <oneit:button   value="Open this job"   name="saveJob" cssClass="btn btn-primary btn-green top-margin-25 largeBtn"
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
                                                                         .mapEntry ("fromPage", fifthPage)
-                                                                        .mapEntry ("openJob", Boolean.TRUE)
+                                                                        .mapEntry("JobStatus", JobStatus.OPEN)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
                                                                         .mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
                                                                         .toMap() %>" />