From 6121cd5892b74cdf5548908c91eae43e398ab6d6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 2 Aug 2016 16:39:44 +0200
Subject: [PATCH] Please cherry-pick: - also export/show house number extension

---
 web/admin/contact/admin_contact_export.xhtml | 2 +-
 web/admin/user/admin_user_export.xhtml       | 2 +-
 web/admin/user/admin_user_show.xhtml         | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 56382ebc..4cb937cc 100644
--- 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 5c051974..1063e002 100644
--- 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 f8ff648e..17df6277 100644
--- 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}" />
 
-- 
2.39.5