Continued with deleting user accounts: (please cherry-pick)

[jjobs-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 4d348cdd43a7c5fb36c7a9a5bac00cd7926e1d4d..02a58ddbd15aef1a425fd3cd661f428f0e65529d 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -17,7 +17,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ADMIN_USER_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+                       <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>
@@ -30,13 +35,15 @@
                                        </h:link>
                                </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                       </f:facet>
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <h:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+                                               </f:facet>
 
-                                       <h:outputText value="#{user.userName}" />
-                               </h:column>
+                                               <h:outputText value="#{user.userName}" />
+                                       </h:column>
+                               </ui:fragment>
 
                                <h:column>
                                        <f:facet name="header">