Please cherry-pick:

- also export/show house number extension

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 56382ebc09343b4965892cafa3cca98b608dd565..4cb937cc0f6a2b751fc477642f2123b9eb2adb8c 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -73,7 +73,7 @@
                                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{contact.contactHouseNumber}" />
+                                               <h:outputText value="#{contact.contactHouseNumber}#{contact.contactHouseNumberExtension}" />
                                        </p:column>
 
                                        <p:column>

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 26e95343a9261a58e32a910ffd5f611aff4aebc9..517d04db3f033ed887000f4975d45660df3b254f 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -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>

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 7a8950d8ca2feb3acc728c3edc632104e93bcb7e..52f447d32b3c745aee7c238236fc1114bc6b6ec2 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -144,6 +144,12 @@
                                        <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
                                </h:column>
 
+                               <h:column>
+                                       <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+                                       <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
+                               </h:column>
+
                                <h:column>
                                        <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />