S12516483 # Client - Incoming Issues (raised by Client) #Client filter should…

S12516483 # Client - Incoming Issues (raised by Client) #Client filter should not show if Hiring Team not set to allow clients

clients menu was not getting disabled correctly when a different hiring team was selected

cmsWebApp/src/performa/utils/MenuItemDisableTransformFactory.java

@@ -8,6 +8,7 @@ import oneit.objstore.ObjectTransaction;
 import oneit.security.SecUser;
 import oneit.utils.ObjectTransform;
 import performa.orm.CompanyUser;
+import performa.orm.HiringTeam;
 
 
 public class MenuItemDisableTransformFactory implements ContentTransformFactory, DefaultInitialisable
@@ -26,21 +27,27 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
         ObjectTransaction   transaction;
         SecUser             secUser;
         CompanyUser         companyUser;
+        HiringTeam          hiringTeam;
         
         public MenuItemDisableTransform(Article article, HttpServletRequest request, ObjectTransaction transaction)
         {
+            HiringTeam selectedTeam =   (HiringTeam) request.getSession().getAttribute("SelectedHiringTeam");
+            
+            selectedTeam = selectedTeam != null ? selectedTeam.getInTransaction(transaction) : null;
+            
             this.article        =   article;
             this.request        =   request;
             this.transaction    =   transaction;
             this.secUser        =   SecUser.getTXUser(transaction);
             this.companyUser    =   this.secUser != null ? this.secUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null;
+            this.hiringTeam     =   selectedTeam != null ?  selectedTeam : this.companyUser != null ? this.companyUser.getSelectedTeam() : null;
         }
         
         @Override
         public Object transform(Object original)
         {
             if((Boolean)article.getAdditionalAttribute("Allow Disable", Boolean.FALSE) 
-                && this.companyUser != null && this.companyUser.getSelectedTeam() != null && !this.companyUser.getSelectedTeam().showHasClientSupport())
+                && this.hiringTeam != null && !this.hiringTeam.showHasClientSupport())
             {
                 return String.valueOf(original);
             }

cmsWebApp/webroot/extensions/adminportal/list_jobs.jsp

@@ -91,7 +91,7 @@
     List<Job>   jobList =   Arrays.asList(jobs);
 
     // filter jobs by client
-    if(selectedClient != null)
+    if(selectedClient != null && selectedClient.getInTransaction(objTran).getHiringTeam() == hiringTeam)
     {
         oneit.utils.filter.Filter<Job>  filter  =   Job.SearchByAll().andClient(new EqualsFilter<>(selectedClient));
 
@@ -185,26 +185,32 @@
                         %>
                     </select>
                 </div>
-                <div class="shorting-dropdown">
-                    <div class="order-label">client</div>
-                    <select class="form-control"    onChange="location=this.value">
-                        <option <%= (selectedClient == null ? "selected" : "" )%>  value="<%= homePage + "&Client"%>">
-                            <oneit:toString value="All Clients"   mode="EscapeHTML"/>
-                        </option>
-                        <%
-                            for (Client  client : Utils.getClientsByHiringTeam(objTran))
-                            {
-                                String  optionLink  =    homePage + "&Client=" + client.getID().longID() ;
-                        %>
-                                <option <%= (client != null && selectedClient != null && client.equals(selectedClient) ? "selected" : "" )%>  value="<%= optionLink %>">
-                                    <oneit:toString value="<%= client.getClientName() %>"   mode="EscapeHTML"/>
+                <%
+                    if(hiringTeam.showHasClientSupport())
+                    {
+                %>
+                        <div class="shorting-dropdown">
+                            <div class="order-label">client</div>
+                            <select class="form-control"    onChange="location=this.value">
+                                <option <%= (selectedClient == null ? "selected" : "" )%>  value="<%= homePage + "&Client"%>">
+                                    <oneit:toString value="All Clients"   mode="EscapeHTML"/>
                                 </option>
-                        <%
-                            }
-                        %>
-                    </select>
-                </div>
-                
+                                <%
+                                    for (Client  client : Utils.getClientsByHiringTeam(objTran))
+                                    {
+                                        String  optionLink  =    homePage + "&Client=" + client.getID().longID() ;
+                                %>
+                                        <option <%= (client != null && selectedClient != null && client.equals(selectedClient) ? "selected" : "" )%>  value="<%= optionLink %>">
+                                            <oneit:toString value="<%= client.getClientName() %>"   mode="EscapeHTML"/>
+                                        </option>
+                                <%
+                                    }
+                                %>
+                            </select>
+                        </div>
+                <%
+                    }
+                %>
             </div>
                     
             <oneit:dynInclude   page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"  ShortlistPage="<%= shortlistPage %>"