Please cherry-pick:

- opps, didn't rename this

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 65bac3a5a7183a3b0a604bdc8bc0e95c1e510f06..5cece1167fc370f9362c3b4d26dfe41628023328 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.faxNumber}">
+                       <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
@@ -45,7 +45,7 @@
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>
@@ -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_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.faxNumber}">
+                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 639004d1c63868ef2548f64255c50c2d1cb7c221..d2832fa093a91bdc230d02287b19b3b07bde9df1 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.landLineNumber}">
+                       <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
@@ -45,7 +45,7 @@
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>
@@ -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_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.landLineNumber}">
+                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>