Please cherry-pick (Massive rewrite):

[jjobs-war.git] / web / admin / landline / admin_landline_delete.xhtml

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