Please cherry-pick:

[jjobs-war.git] / web / admin / fax / admin_fax_show.xhtml

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 9b28b3fa4722a7cd1110bda2ca15739784027cfd..8d736fe59c0e8d242406dc950bb24d1ead925afe 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -8,7 +8,7 @@
        <ui:define name="metadata">
                <f:metadata>
                        <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -22,10 +22,10 @@
 
        <ui:define name="content">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_data.tpl">
-                       <ui:param name="isShowPage" value="#{true}" />
+                       <ui:param name="isShowPage" value="true" />
                </ui:include>
 
-               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+               <h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                        <f:facet name="header">
                                <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />