Please cherry-pick:

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

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 3f7d14d0a9a3a12db5e00d1e3e9afa4cdeb37080..0dc8a1a3b738ce7d14a66c443b72cf4a785e5b55 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -11,7 +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: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:metadata>
        </ui:define>
@@ -25,9 +32,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
-               <h:form id="form-admin-edit-contact" rendered="#{not empty beanHelper.contact}">
+               <h:form rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />
 
                        <h:panelGroup layout="block">
@@ -41,7 +46,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
                                <p:panelGrid columns="2" layout="grid">
                                        <p:commandButton
@@ -50,7 +55,6 @@
                                                />
 
                                        <p:commandButton
-                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}"
                                                action="#{adminContactController.editContactData()}"