Please cherry-pick:

[jjobs-war.git] / web / admin / landline / admin_landline_edit.xhtml

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 6269f8ea1bafd7ff74c05eb23f61b1ec2366cf8a..0cd4560ea73b5ec10905015294f8d57ec81ecea1 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -7,30 +7,36 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE}</ui:define>
+               <ui:define name="metadata">
+                       <f:metadata>
+                               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+                       </f:metadata>
+               </ui:define>
+
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
                        <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
                                <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
-                                               #{msg.ADMIN_EDIT_LAND_LINE_TITLE}
+                                               <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
+                                                       <f:param value="#{beanHelper.landLineNumber.phoneId}" />
+                                               </h:outputFormat>
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
 
                                        <div class="table_footer">
                                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE}" action="#{adminPhoneController.editMobileData()}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.editLandLineData(beanHelper.landLineNumber)}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>