Please cherry-pick:

- was still using contactController.allContacts() should be
  contactListController.allContacts as "allContacts" is a bean property now.

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

diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
index f8a03b40b048e92f3fd2240740dc16e86594cb5e..91e7e1b7ff63aa5c19d854cf58641b4d91873ad4 100644 (file)
--- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
+++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl
@@ -78,7 +78,7 @@
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 
                                <f:selectItems
-                                       value="#{contactController.allContacts()}"
+                                       value="#{contactListController.allContacts}"
                                        var="contact"
                                        itemValue="#{contact}"
                                        itemLabel="#{beanHelper.renderContact(contact)}"

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 768bd94f3b591dd5eadbde64bd1d45a51e1dbda3..42abae09ba0b16c037dbe5fd9a89e7d75c22ae2b 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -18,11 +18,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:form rendered="#{not contactController.allContacts().isEmpty()}">
+               <h:form rendered="#{not contactListController.allContacts.isEmpty()}">
                        <p:dataTable
                                id="table_export_contacts"
                                var="contact"
-                               value="#{contactController.allContacts()}"
+                               value="#{contactListController.allContacts}"
                                paginator="true"
                                rows="10"
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"