S12521956 # Client - Incoming Issues (raised by Client) #Client selection for…

S12521956 # Client - Incoming Issues (raised by Client) #Client selection for Hiring Team without clients

cmsWebApp/webroot/extensions/adminportal/edit_job.jsp

@@ -42,17 +42,8 @@
                                 </div>
                                 <!--<div class="optional-title">OPTIONAL</div>-->
                                 <div class="row">
-                                    <div class="col-sm-6 col-xs-12 form-group">
-                                        <label><oneit:label GUIName="Client"/></label>
-                                        <div class="wider-select">
-                                            <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Client"  options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
-                                        </div> 
-                                    </div>
                                     <%
-                                        SecUser     txUser      =   SecUser.getTXUser(process.getTransaction());
-                                        CompanyUser companyUser =   txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
-                    
-                                        if(companyUser.getCompany().showHasClientSupport())
+                                        if(job.getHiringTeam().showHasClientSupport())
                                         {
                                     %>
                                             <div class="col-sm-6 col-xs-12 form-group">

cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp

@@ -43,12 +43,12 @@
         {
             int     shortlisted     =   job.getNoOfCandidatesFor(ApplicationStatus.SHORTLISTED);
             int     maxShortlist    =   job.getMaxShortlistApplicants();
+            String  editJobPage     =   nextPage;
             
             // go to edit job if job is in draft status
             if(job.getJobStatus() == JobStatus.DRAFT)
             {
                 Article jobsArticle =   WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
-                String  editJobPage =   "";
 
                 if(job.getDraftLocation() == null)
                 {
@@ -67,7 +67,7 @@
                     editJobPage =   jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.WORKPLACE_CULTURE).toMap());
                 }
 
-                nextPage    =   editJobPage + "&JobID=" + job.getObjectID();  
+                editJobPage    =   editJobPage + "&JobID=" + job.getObjectID();  
             }
     %>
             <div class="job-list"   id="<%= job.getID() %>">
@@ -75,7 +75,7 @@
                     <div class="job-post jl-c eq-second-height" style="height: 107px;">
                         <div class="job-post-name">
                             <oneit:button   value=" "   name="gotoPage" skin="link"
-                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", editJobPage)
                                                                             .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
                                                                             .toMap() %>">
                                     <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />