Please cherry-pick:

- ops, needs to be ContactConverter

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
index 0ef2e0d88c73d243df6f3a5029d0e60a18d374cf..15bf65eb311e0d361a9f7ea60d90e6ac4877dd64 100644 (file)
--- a/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
+++ b/web/WEB-INF/templates/admin/department/admin_form_department_data.tpl
@@ -94,7 +94,7 @@
                                filterMatchMode="contains"
                                >
 
-                               <f:converter converterId="EmployeeConverter" />
+                               <f:converter converterId="ContactConverter" />
 
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index f64afc28da8ca6daaeddbfb29de3c4a0eb959629..192053de6b47f322c9c708ab7ceb06bbc3edd7aa 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -192,7 +192,7 @@
 
                                <p:column
                                        headerText="#{msg.ADMIN_DEPARTMENT_LEAD_EMPLOYEE}"
-                                       sortBy="#{department.departmentLead.contactFamilyName}"
+                                       sortBy="#{department.departmentLead}"
                                        filterBy="#{department.departmentLead}"
                                        filterMatchMode="in"
                                        >