From: Roland Häder <roland@mxchange.org>
Date: Mon, 11 May 2020 01:51:04 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20ec5d9d9dbf3902ae1c08cec452dd6bd3bf819a;p=jfinancials-war.git

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 0ef2e0d8..15bf65eb 100644
--- 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 f64afc28..192053de 100644
--- 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"
 					>