Please cherry-pick:

[jjobs-war.git] / web / admin / mobile / admin_mobile_edit.xhtml

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 59293a7345bfaf01f31197f69c19b81139edd467..09f436e475a41832f70c3027bce6cc6002d9d5f0 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -7,35 +7,39 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-       </f:metadata>
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewAction onPostback="true" action="#{beanHelper.copyMobileNumberToController()}" />
+               </f:metadata>
+       </ui:define>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE}</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}</ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE}
+                       #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
+                       <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                                <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
-                                               #{msg.ADMIN_EDIT_MOBILE_TITLE}
+                                               <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
+                                                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+                                               </h:outputFormat>
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_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_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE}" action="#{adminPhoneController.editMobileData()}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.editMobileData()}" />
                                        </div>
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
                </ui:define>
        </ui:composition>
 </html>