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 166495221c52129593ee1eb018bfcbcca31188fc..d2b7dd85df084914e565627bcaad1e016fb6143f 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -11,7 +11,14 @@
 
        <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}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,9 +32,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-               <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
+               <h:form rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
@@ -44,7 +49,6 @@
                                                />
 
                                        <p:commandButton
-                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}"
                                                action="#{adminPhoneController.doChangeLandLineNumber()}"