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 176979d07028ff00e253582687157ed9619707b0..2dda44de6aa58996b24bee8bbba9add3b0fa171e 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,11 +7,14 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         >
  
-       <f:metadata>
-               <f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-       </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}" />
+                               <f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+                       </f:metadata>
+               </ui:define>
+
                 <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
  
                 <ui:define name="content_header">
@@ -20,7 +22,7 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
  
                         Here goes your content.
                 </ui:define>