Continued a bit: (please cherry-pick this)

[addressbook-war.git] / web / admin / user / admin_user_export.xhtml

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 4938f98a3021181fe93d3ebe597601bc44eb135b..5c051974951f6e574759cff2a35f7d35a6888825 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -28,7 +28,7 @@
                                                </h:link>
                                        </p:column>
 
-                                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
                                                <p:column>
                                                        <f:facet name="header">
                                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />
@@ -182,7 +182,7 @@
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                                       <p:dataExporter type="xls" target="table_export_users" fileName="admin_users" />
+                                                       <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
                                                </h:commandButton>
                                        </div>
                                </div>