Please cherry-pick:

[jjobs-war.git] / web / admin / headquarter / admin_headquarter_list.xhtml

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index f8f18a88436abaefd8aa9de1deae17829672d18e..c19e0f27cc5a37fff97d2aa67cb63effce9f5b40 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -186,28 +185,28 @@
                                                        updateLabel="true"
                                                        title="#{msg.FILTER_BY_MULTIPLE_EMPLOYEES_TITLE}"
                                                        >
-                                                       <f:converter converterId="EmployeeConverter" />
+                                                       <f:converter converterId="ContactConverter" />
 
                                                        <f:selectItems
-                                                               value="#{employeeListController.allEmployees}"
-                                                               var="employee"
-                                                               itemValue="#{employee}"
-                                                               itemLabel="#{beanHelper.renderEmployee(employee, false)}"
+                                                               value="#{contactListController.allContacts}"
+                                                               var="contact"
+                                                               itemValue="#{contact}"
+                                                               itemLabel="#{beanHelper.renderContact(contact)}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
                                        <p:link
-                                               outcome="admin_show_employee"
-                                               value="#{beanHelper.renderEmployee(headquarter.headquarterContactEmployee, false)}"
+                                               outcome="admin_show_contact"
+                                               value="#{beanHelper.renderContact(headquarter.headquarterContactEmployee)}"
                                                title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_CONTACT_PERSON_TITLE}"
                                                rendered="#{not empty headquarter.headquarterContactEmployee}"
                                                >
-                                               <f:param name="employeeId" value="#{headquarter.headquarterContactEmployee.employeeId}" />
+                                               <f:param name="contactId" value="#{headquarter.headquarterContactEmployee.contactId}" />
                                        </p:link>
 
                                        <p:link
-                                               outcome="admin_assign_headquarter_employee"
+                                               outcome="admin_assign_headquarter_contact"
                                                value="#{msg.ADMIN_LINK_ASSIGN}"
                                                title="#{msg.ADMIN_LINK_ASSIGN_HEADQUARTER_CONTACT_PERSON_TITLE}"
                                                rendered="#{empty headquarter.headquarterContactEmployee}"