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 28ede7acc79921a573aa80db7fc9bb870ebd795d..90ea0adb0d36c5167d78c8b62ec33ad0c5e0e739 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <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 onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -26,6 +28,8 @@
                <core:outputMessageBox id="error-handler-contact" 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:inputHidden value="#{adminContactController.contactId}" />
+
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
@@ -39,11 +43,13 @@
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="button-danger" type="submit" id="submit_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-                               </div>
-                       </h:panelGroup>
+                               <p:commandButton
+                                       process="@form"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
+                                       action="#{adminContactController.deleteContactData()}"
+                                       />
+                               </p:panelGrid>
                </h:form>
        </ui:define>
 </ui:composition>