J008 - 'Open'-ing job from this screen may not set the expiration date properly

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -34,18 +34,18 @@ public class SaveJobFP extends SaveFP
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
 
         Job oldJob  = (Job) job.getEarliestBackup();
-
-        if(openJob==Boolean.TRUE)
-        {
-            job.setJobStatus(JobStatus.OPEN);
-            
-            LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
-        }
         
-        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && job.getJobStatus() == JobStatus.OPEN)
+        if(oldJob != null && oldJob.getJobStatus() == JobStatus.DRAFT && (job.getJobStatus() == JobStatus.OPEN || openJob==Boolean.TRUE))
         {
             job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
             job.setOpenDate(new Date());
+            
+            if(openJob==Boolean.TRUE)
+            {
+                job.setJobStatus(JobStatus.OPEN);
+
+                LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"Job status changed as Open. ", job );
+            }
         }
         
         if(job.getJobStatus() == JobStatus.OPEN && job.getShortenedURL() == null)