Please cherry-pick:

- opps, missed to "hide" this if the user list is not empty

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 6f1a07e1bb2b433a8842f53513355caa9da0e5e0..45885d92fa7137b538658e8656bdf40fb68290c7 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -17,10 +17,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <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 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>
 
                        <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>