Please cherry-pick:

[pizzaservice-war.git] / web / admin / user / admin_user_list.xhtml

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 43f73d7637ef23551b43dbb894802ad2ee407dd2..51acd1574d848d4f9bc13c4b7a132b76a22d58df 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,12 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
 
                <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
                        <h:column>
@@ -112,7 +108,7 @@
                                                        </div>
 
                                                        <div class="table_right_medium">
-                                                               <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
+                                                               <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
                                                                        <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
                                                                        <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                </h:selectOneMenu>