New "feature" controller introduced: (please cherry-pick this)

[jjobs-war.git] / web / admin / cellphone / admin_contact_cellphone_show.xhtml
diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml

index 6df2183439a700903c731e02a072b0e7b204ff95..7a8be2ad624f15fa17a5d4ff299bbbca1aa48929 100644 (file)
--- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -9,7 +8,7 @@
         >
  
         <f:metadata>
-               <f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
         </f:metadata>
  
         <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -21,14 +20,13 @@
  
                 <ui:define name="content">
                         <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
-                               <ui:param name="cellphoneNumber" value="#{adminContactPhoneController.cellPhone}" />
                                 <ui:param name="isShowPage" value="#{true}" />
                         </ui:include>
  
-                       <h:dataTable id="contact_cellphone_link" var="contact" value="#{adminContactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <h:dataTable id="contact_cellphone_link" var="contact" value="#{adminPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                 <f:facet name="header">
                                         <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS}">
-                                               <f:param value="#{adminContactPhoneController.cellPhone.phoneId}" />
+                                               <f:param value="#{adminPhoneController.cellPhone.phoneId}" />
                                         </h:outputFormat>
                                 </f:facet>
  
@@ -81,7 +79,7 @@
                                                         <li class="mini_link">
                                                                 <h:link outcome="admin_unlink_contact_cellphone">
                                                                         <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{adminContactPhoneController.cellPhone.phoneId}" />
+                                                                       <f:param name="phoneId" value="#{adminPhoneController.cellPhone.phoneId}" />
                                                                         <f:param name="contactId" value="#{contact.contactId}" />
                                                                 </h:link>
                                                         </li>