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 25c8161f69fce8a9702f05dc73a22710927f6ada..b95f567a1109c434704d0a01bca34d10d6a23a7a 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -8,7 +8,7 @@
        <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:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
@@ -22,7 +22,7 @@
 
        <ui:define name="content">
                <ui:fragment rendered="#{empty beanHelper.user}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
                                <ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>
@@ -57,7 +57,7 @@
 
                                <div class="table_footer">
                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData(beanHelper.user)}" />
+                                       <h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>