culture template, job template, client list fix on changing hiring team from top drop down

cmsWebApp/webroot/extensions/adminportal/culture_templates.jsp

@@ -21,17 +21,10 @@
         response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
     }
 
-    CultureCriteriaTemplate[]   templates   =   (CultureCriteriaTemplate[]) process.getAttribute("CultureCriteriaTemplates");
-
-    if(templates == null)
-    {
-        templates   =   CultureCriteriaTemplate.SearchByAll()
-                                                .andHiringTeam(new EqualsFilter<>(hiringTeam))
-                                                .andCompanyUser(new EqualsFilter<>(companyUser))
-                                                .search(transaction);
-        
-        process.setAttribute("CultureCriteriaTemplates", templates);
-    }
+    CultureCriteriaTemplate[]   templates   =   CultureCriteriaTemplate.SearchByAll()
+                                                                        .andHiringTeam(new EqualsFilter<>(hiringTeam))
+                                                                        .andCompanyUser(new EqualsFilter<>(companyUser))
+                                                                        .search(transaction);
      
     // handle client
     if( parameterMap.containsKey("Client"))

cmsWebApp/webroot/extensions/adminportal/edit_culture_template.jsp

@@ -11,6 +11,15 @@
     String                  nextPage    =   WebUtils.getSamePageInRenderMode(request, "Page");
 
     Debug.assertion(template != null && !toRedirect, "Invalid template in culture templates");
+    
+    SecUser                 secUser         =   SecUser.getTXUser(transaction);
+    CompanyUser             companyUser     =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+    HiringTeam              hiringTeam      =   companyUser.getSelectedTeam();
+
+    if(hiringTeam != template.getHiringTeam())
+    {
+        response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
+    }
 
     template.pipelineCultureCriteriaTemplate().toCultureCriterias().toCultureElement().toRatings().uniqueVals(); //preloading data
 %>

cmsWebApp/webroot/extensions/adminportal/edit_job_template.jsp

@@ -12,7 +12,15 @@
     String                      samePage    =   WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB_TEMP);
 
     Debug.assertion(template != null && !toRedirect, "Invalid template in job templates");
+    
+    SecUser                 secUser         =   SecUser.getTXUser(transaction);
+    CompanyUser             companyUser     =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+    HiringTeam              hiringTeam      =   companyUser.getSelectedTeam();
 
+    if(hiringTeam != template.getHiringTeam())
+    {
+        response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
+    }
 %>
     <style>
         button[disabled] {

cmsWebApp/webroot/extensions/adminportal/job_templates.jsp

@@ -21,18 +21,11 @@
         response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
     }
 
-    AssessmentCriteriaTemplate[]   templates   =   (AssessmentCriteriaTemplate[]) process.getAttribute("AssessmentCriteriaTemplates");
+    AssessmentCriteriaTemplate[]   templates   =   AssessmentCriteriaTemplate.SearchByAll()
+                                                                                .andHiringTeam(new EqualsFilter<>(hiringTeam))
+                                                                                .andCompanyUser(new EqualsFilter<>(companyUser))
+                                                                                .search(transaction);
 
-    if(templates == null)
-    {
-        templates   =   AssessmentCriteriaTemplate.SearchByAll()
-                                                    .andHiringTeam(new EqualsFilter<>(hiringTeam))
-                                                    .andCompanyUser(new EqualsFilter<>(companyUser))
-                                                    .search(transaction);
-        
-        process.setAttribute("AssessmentCriteriaTemplates", templates);
-    }
-     
     // handle client
     if( parameterMap.containsKey("Client"))
     {

cmsWebApp/webroot/extensions/adminportal/list_clients.jsp

@@ -18,7 +18,7 @@
 
     String              clientPage      =   WebUtils.getSamePageInRenderMode(request, "Page");
     ClientSortOption    clientSortOpt   =   (ClientSortOption) process.getAttribute("ClientSortOption");
-    Client[]            clients         =   (Client[]) process.getAttribute("Clients");
+    Client[]            clients         =   Utils.getClientsByHiringTeam(transaction);;
 
     if( request.getParameter("ClientSortOption") != null)
     {
@@ -30,13 +30,6 @@
         clientSortOpt   =   ClientSortOption.ALPHA_A_Z;
     }
     
-    if(clients == null)
-    {
-        clients =   Utils.getClientsByHiringTeam(transaction);
-        
-        process.setAttribute("Clients", clients);
-    }
-    
     List<Client>    sortedClients   =   Utils.getClientsSorted(clients, clientSortOpt);
     
     process.setAttribute("ClientSortOption", clientSortOpt);