Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_delete.xhtml

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 7a2802b8d9a6df024c4878798b6ae8d9de927990..c3740b3c92797aa51d755a86949e1fc701d68a3b 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,12 +8,14 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <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="metadata">
+                       <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:define>
+
                <ui:define name="admin_title">
                        <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
                </ui:define>