Continued: (please cherry-pick)

[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 0d44f6218a002aee60568c047b1ea2c570b01074..1063e00233fa494de456517e4fb63ed3e434392b 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}" />
@@ -91,7 +91,7 @@
                                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{user.userContact.contactHouseNumber}" />
+                                               <h:outputText value="#{user.userContact.contactHouseNumber}#{user.userContact.contactHouseNumberExtension}" />
                                        </p:column>
 
                                        <p:column>
@@ -181,8 +181,8 @@
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                                       <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+                                               <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="all_users" />
                                                </h:commandButton>
                                        </div>
                                </div>