Please cherry-pick:

[jjobs-war.git] / web / admin / fax / admin_fax_delete.xhtml

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index c1dad067f2a69b087538b550a37d015605c1bd53..2c98a7d1d6e3924c5356766fcf43663176e265c7 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,9 +32,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-               <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
+               <h:form rendered="#{not empty beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminPhoneController.phoneId}" />
 
                        <h:panelGroup styleClass="table" layout="block">
@@ -36,7 +41,11 @@
                                </div>
 
                                <div class="para">
-                                       <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminFaxPanelGrid
+                                               faxNumber="#{beanHelper.faxNumber}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
                                <div class="para">
@@ -44,7 +53,6 @@
                                </div>
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_ADMIN_DELETE_FAX}"
                                        action="#{adminPhoneController.deleteFaxData()}"