minor changes to finetune messaging engine

cmsWebApp/src/performa/batch/MessagingEngineBatch.java

@@ -51,9 +51,9 @@ public class MessagingEngineBatch extends ORMBatch implements InitialisationPart
                                                                 new String[] {jobApplication.getCandidate().getFirstName(), 
                                                                                 jobApplication.getCandidate().getUser().getLastName(), 
                                                                                 jobApplication.getCandidate().getUser().getEmail(), 
-                                                                                jobApplication.getJob().getGoogleAddressText(), 
+                                                                                StringUtils.subNulls(jobApplication.getJob().getGoogleAddressText(), ""), 
                                                                                 jobApplication.getJob().getJobTitle(), 
-                                                                                jobApplication.getJob().getReferenceNumber()});
+                                                                                StringUtils.subNulls(jobApplication.getJob().getReferenceNumber(), "")});
             
             LogMgr.log (MESSAGING_ENGINE_BATCH, LogLevel.PROCESSING1, "Replaced tags of message content : " , messageContent);
             

cmsWebApp/src/performa/orm/JobApplication.java

@@ -42,7 +42,7 @@ public class JobApplication extends BaseJobApplication
             JobApplication old  =   (JobApplication) getEarliestBackup();
             
             // when application status changed
-            if(!CollectionUtils.equals(old.getApplicationStatus(), getApplicationStatus()))
+            if(getStatus() == ObjectStatus.NEW || !CollectionUtils.equals(old.getApplicationStatus(), getApplicationStatus()))
             {
                 // delete previously scheduled emails for previous application status
                 Filter<ScheduledEmail>  filter  =   ScheduledEmail.SearchByAll().andApplicationStatus(new EqualsFilter<>(old.getApplicationStatus()));

cmsWebApp/webroot/extensions/performa/editMessageTemplate.jsp

@@ -63,7 +63,8 @@
             <oneit:ormlabel obj="<%= messageTemplate %>"    field="ApplicationStatus"/>
         </oneit:layout_label>
         <oneit:layout_field width="1">
-            <oneit:ormEnum  obj="<%= messageTemplate %>"    attributeName="ApplicationStatus"    />
+            <oneit:ormEnum  obj="<%= messageTemplate %>"    attributeName="ApplicationStatus"    
+                            enums="<%= Arrays.asList(new ApplicationStatus[]{ApplicationStatus.DRAFT, ApplicationStatus.SUBMITTED, ApplicationStatus.SHORTLISTED, ApplicationStatus.UNSUITABLE}) %>"/>
         </oneit:layout_field>
     </oneit:skin>