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 45885d92fa7137b538658e8656bdf40fb68290c7..02a58ddbd15aef1a425fd3cd661f428f0e65529d 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -35,13 +35,15 @@
                                        </h:link>
                                </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                       </f:facet>
-
-                                       <h:outputText value="#{user.userName}" />
-                               </h:column>
+                               <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>
+                               </ui:fragment>
 
                                <h:column>
                                        <f:facet name="header">