S18689546 # Client - Incoming Issues (raised by Client) #Unable to use job template if no clients

cmsWebApp/src/performa/orm/Job.java

@@ -309,7 +309,7 @@ public class Job extends BaseJob
     }
     
     
-    public List<AssessmentCriteriaTemplate> getAssessmentTemplates()
+    public AssessmentCriteriaTemplate[] getAssessmentTemplates()
     {
         CompanyUser     companyUser =   SecUser.getTXUser(getTransaction()).getExtension(CompanyUser.REFERENCE_CompanyUser);
 
@@ -320,12 +320,8 @@ public class Job extends BaseJob
         {
             search  =   search.andClient(new EqualsFilter<>(getClient()));
         }
-        else
-        {
-            search  =   search.andClient(new IsNullFilter<>());
-        }
-        
-        return  Arrays.asList(search.search(getTransaction()));
+
+        return  search.search(getTransaction());
     }
     
     

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -13,7 +13,7 @@
     
     SecUser                             txUser      =   SecUser.getTXUser(process.getTransaction());
     CompanyUser                         companyUser =   txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
-    List<AssessmentCriteriaTemplate>    templates   =   job.getAssessmentTemplates();
+    AssessmentCriteriaTemplate[]        templates   =   job.getAssessmentTemplates();
     String                              nextPage    =   WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
 %>
 
@@ -256,7 +256,7 @@
                 <div class="create-job"> 
                     <div class="form-page-section">
                     <%
-                        if(templates.size() > 0)
+                        if(templates.length > 0)
                         {
                     %>
                             <oneit:button   value=" "   name="loadJobFromTemplate"  cssClass="hide"
@@ -265,7 +265,7 @@
                                                                             .toMap() %>" />
 
                             <div class="form-group wider-select">
-                                <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate" options="<%= templates.toArray(new AssessmentCriteriaTemplate[0])  %>"  
+                                <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate" options="<%= templates  %>"  
                                                                 blankValue="Optional: Use another Job as a starting point"/>
                             </div>
                     <%

cmsWebApp/webroot/extensions/adminportal/job_start_point.jsp

@@ -29,6 +29,8 @@
     job.setJobOwner(companyUser);
     job.setIndustry(hiringTeam.getIndustry());
     job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
+
+    AssessmentCriteriaTemplate[]    templates   =   job.getAssessmentTemplates();   
 %>
 <style>
     .rectangle-4.special{
@@ -96,8 +98,8 @@
                                         </oneit:recalcClass>
                                         <div style="padding-top:10px;">
                                             <oneit:recalcClass  htmlTag="div"  classScript="(!hiringTeam.showHasClientSupport() || (hiringTeam.showHasClientSupport() && job.getClient() != null)) ? 'show': 'hide'"    hiringTeam="<%= hiringTeam %>" job="<%= job %>">
-                                                <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate"  optionsScript="job.getAssessmentTemplates()" job="<%= job%>"  
-                                                                        blankValue="Select your template"/>
+                                                <tagfile:ormsingleasso_select   obj="<%= job %>"    assocName="AssessmentTemplate" options="<%= templates %>"  
+                                                                                blankValue="Select your template"/>
                                             </oneit:recalcClass>
                                         </div>
                                     </oneit:recalcClass>