Please cherry-pick:

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

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 2098e992672be6cb389f482d35d90b38f89f4334..37d4d2b168c60fbb4cb019dc821ffbf8bae8ab3b 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.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,16 +32,18 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-               <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
+               <h:form rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" renderShowLink="false" showAdminDropdownMenu="false" />
+                                       <core:outputAdminLandLinePanelGrid
+                                               landLineNumber="#{beanHelper.landLineNumber}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
                                <div class="para">
@@ -42,7 +51,6 @@
                                </div>
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}"
                                        action="#{adminPhoneController.deleteLandLineData()}"