From: Roland Häder <roland@mxchange.org>
Date: Tue, 16 Aug 2016 10:25:14 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e5245afa3e0be95b898f77a040a187118f6b5166;p=jjobs-war.git

Please cherry-pick:
- also needs renaming (yes, renaming-season is not yet over ...)
---

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index 76d703b0..82e5c697 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -7,11 +7,11 @@
 
 	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-	<ui:fragment rendered="#{empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
+	<ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
 	</ui:fragment>
 
-	<ui:fragment rendered="#{not empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
+	<ui:fragment rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
 	</ui:fragment>
 </ui:composition>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 5421c06f..f144a4e2 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -123,7 +123,7 @@
 							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{adminContactController.generateCellphoneNumber(contact.contactCellphoneNumber)}" />
+						<h:outputText value="#{adminContactController.generateCellphoneNumber(contact.contactMobileNumber)}" />
 					</p:column>
 
 					<p:column>
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index beedcd7b..0da682c4 100644
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -20,7 +20,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.mobileNumber}">
+			<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
@@ -54,7 +54,7 @@
 
 			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.mobileNumber}">
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
 				<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 				<f:param value="#{beanHelper.contact.contactId}" />
 			</h:outputFormat>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index f9bc117d..b3e7d6dd 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -141,7 +141,7 @@
 							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
 						</f:facet>
 
-						<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
+						<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactMobileNumber)}" />
 					</p:column>
 
 					<p:column>