Update culture answer initialization.

cmsWebApp/src/performa/orm/JobApplication.java

@@ -53,18 +53,23 @@ public class JobApplication extends BaseJobApplication
     }
     
     
-    public void initCCAnswers()
+    public Boolean initCCAnswers()
     {
+        Boolean redirect    = Boolean.FALSE;
+        
         if(this.getCultureCriteriaAnswersCount()==0)
         {
             for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet())
             {
+                redirect                        = Boolean.TRUE;
                 CultureCriteriaAnswer   answer  = CultureCriteriaAnswer.createCultureCriteriaAnswer(getTransaction());
 
                 addToCultureCriteriaAnswers(answer);
                 cultureCriteria.addToAnswers(answer);
             }
         }
+        
+        return redirect;
     }
     
     

cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp

@@ -13,9 +13,12 @@
     exitPage                            =   exitPage + "&id=" + job.getID() + "&key=" + job.getRandomKey();
     String              sectionNo       =   jobApplication.isIncludeAssessmentCriteria() ? "2" : "1";
     String              nextBtnText     =   jobApplication.isIncludeAssessmentCriteria() ? "Proceed to step 3" : "Proceed to step 2";
+    boolean             toRedirect      =   jobApplication.initCCAnswers();
     
-    //to fix mandatory issue in save and continue
-    jobApplication.initCCAnswers();
+    if(toRedirect)
+    {
+        %><%@include file="/saferedirect.jsp" %><%
+    }
 
     process.setAttribute("JobApplication", jobApplication);
 %>