Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_delete.xhtml

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 037459485470d235d6b2bb18a430cfabb53c6830..ed461dee2292c046816b0b6ec3c4f2974113b70d 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -11,8 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{adminContactController.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
@@ -25,9 +31,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-               <h:form id="form-admin-delete-user" rendered="#{not empty beanHelper.contact}">
+               <h:form rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />
 
                        <h:panelGroup styleClass="table" layout="block">
@@ -44,7 +48,6 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
                                <p:commandButton
-                                       process="@form"
                                        type="submit"
                                        value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
                                        action="#{adminContactController.deleteContactData()}"