Please cherry-pick:

- cleanups in JSF, some missing helper calls added, still I need to
  figure out where to put <f:metadata> correctly ... :-/

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d9debf2fe23af581ef7b9f3f87adb5400d963f1e..81e28bf0a3d86a2f9fb5838071791fc5de9f6f11 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -8,14 +8,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <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.copyContactToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
                </ui:define>

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 0f9c851b1ab71d8feee780d8dd93b39ad7aac825..e0ea8d77243d0a48430ba20a1c9ca9ad589e7298 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -8,14 +8,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewAction action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <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.copyContactToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
                </ui:define>

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index b8368b89f667a6f77f67a76db9f7f6fc6554e2df..a01e615dad559e454cd690114859e0e4e6c07e0a 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyContactToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
                </ui:define>

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 92b938f35a96e3ead4b53049c6e494e11fd15e6f..53dc21cbea06bd75f706ce21d2712ee19cdc8485 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-                       </f:metadata>
-               </ui:define>
+       <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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
                </ui:define>

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 83c4aec9788d3c9b74ffe59f2eb83510d7754e51..cc02f580574c3b38674c8d47aa3fec7f371e15e8 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-                       </f:metadata>
-               </ui:define>
+       <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="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index ef2a67d5bc6158607a90a8abd75142ebf3b3411a..90ab08c202a330c8c47aebca78331897e88e1265 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -7,12 +7,10 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-               </f:metadata>
-       </ui:define>
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_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:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 6c5759411b1b0caeecb6503bfb6858d3d67f98a3..af1520428061f8be4e99253a66470e5bd22199f0 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -7,13 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                       </f:metadata>
-               </ui:define>
+       <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:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
                </ui:define>

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 984dcfe2783c991da894b312a7aec9abc6ce1a4c..c7067b07cd47e217b43e6533cd57686af5bddcb9 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <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:viewAction action="#{beanHelper.copyFaxNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
                </ui:define>

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 2c5f755f9a6352a4907abd254014041fcd5cc732..7d3579bc0217da1a79af0eb65de4bf2646fe88e3 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -7,13 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyFaxNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
                </ui:define>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index a3a1bbba9925334d888acf0a35d4a814133c1b52..2d899f74e13ae5474cdbe537d5fa261343f16599 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -7,13 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                       </f:metadata>
-               </ui:define>
+       <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:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
                </ui:define>

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index ce87dc5787871902a6efdc5ec5cdb05adf28f648..e524a72f3a105c198e36398833e3a3199843534c 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <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:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index b36826bda1af08d017632754a14055967fec156b..12f321fff9e4ba51ad312ca3f84cd87e0672b8bf 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -7,13 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <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}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewAction action="#{beanHelper.copyLandLineNumberToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
                </ui:define>

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 3c4bb59d0ab5d6c0698226d9ea355a68506cb00c..c6858c460d8dea2d8ae59c5c283b185b1fa46aec 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -8,8 +8,8 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_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:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index de23aa3f3007d864b1f63a5dbab42c80e515cc6c..61b201919a6b5ff47833abf7af1a09455211af64 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -7,11 +7,10 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-               </f:metadata>
-       </ui:define>
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+       </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 88328ed08e4fedc177e8c14915a9b8b40b3e525d..67982d911b8fe7d1c931c99b35c74bbfaded14ad 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -7,12 +7,10 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-                       <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
-               </f:metadata>
-       </ui:define>
+       <f:metadata>
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+               <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
+       </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 841bd93bed7c38c225199c68bdeca9abb2b141d8..465a77cce363bb0eb88985649618ad7e69c38cac 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -7,19 +7,18 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
                </f:metadata>
-       </ui:define>
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 862dcc1d07af5a89f6e9e4a1f9271e84f3df4e0e..88ff48a375facf443eee05a6f09f37469ec482e9 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 2e927990aada86e240d34a34f2ec71fbf8281d9c..7a2802b8d9a6df024c4878798b6ae8d9de927990 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,14 +8,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 8a706644d539c65b32601fab2c911e5583aba86a..174b1a9802a4d81eb9e3fce6965efab9f33cf6f3 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                               <f:viewAction action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index b39945f4f7a7376445c8e2d8d83300073ad6745a..3923130f8abb9a7dc114dbe6b5acdd467a675fa6 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 036f97cc634c4b7c15a3fe880c7935efc4aa904a..7544cb04e3016de0e8de39e29b273a095dcdfb88 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -7,12 +7,10 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-               </f:metadata>
-       </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index cbe6b44a82b5281f139efc43cb67ec6415d6ce89..9a5f1b206a933ffd2926ec7d605545657a840e31 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
                </ui:define>

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index b7c91b4aeae55e48fddf230c898621d9cc05bfb9..8988b3bbb416d27d4a5675439eee2e61d5bbd248 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -8,12 +8,10 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:define name="metadata">
-               <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
-               </f:metadata>
-       </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
                <ui:define name="admin_title">

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index a49b6eaadb22c38d940d0f944c3924669f907727..81dea8eb948460cfb9b91ead936b6e9b6424c50a 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -7,14 +7,12 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-                               <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+               <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="guest_title">
                        <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
                </ui:define>

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index db10a2fc99a0b36719925a2a5f632ceb72817bfd..dd7a61e965419a7ce335ac49bbbdf5c43c91b318 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -7,16 +7,12 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="metadata">
-                       <f:metadata>
-                               <f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
-                                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                                       <f:validator for="userId" validatorId="UserIdValidator" />
-                               </f:viewParam>
-                       </f:metadata>
-               </ui:define>
+       <f:metadata>
+               <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+               <f:viewAction action="#{beanHelper.copyUserToController()}" />
+       </f:metadata>
 
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="login_title">
                        <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
                </ui:define>