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 f551e27910b2a11e1de868b992d16a60fbfcc9d4..2cd6db147d07ac46c2980337a3201c6a435c30b0 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -11,7 +11,14 @@
 
        <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}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,13 +32,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-               <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
+               <h:form rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
-                                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+                                               <f:param value="#{beanHelper.mobileNumber.mobileId}" />
                                        </h:outputFormat>
                                </div>
 
@@ -44,10 +49,9 @@
                                                />
 
                                        <p:commandButton
-                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}"
-                                               action="#{adminPhoneController.doUpdateMobileNumber()}"
+                                               action="#{adminMobileController.doUpdateMobileNumber()}"
                                                />
                                </p:panelGrid>
                        </h:panelGroup>