Continued: (please cherry-pick)

[addressbook-war.git] / web / admin / user / admin_user_edit.xhtml

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 90a46c0f79fef84a3b16bcaa51002b88dc41deff..f7a826ff135b2c22d25e28b6ae3af4524cd2a1d3 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -9,7 +9,8 @@
        >
 
        <f:metadata>
-               <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <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:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -20,24 +21,26 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.user}" />
-
-                       <h:form id="admin_edit_user" rendered="#{not empty adminHelper.user}">
-                               <div class="table_header">
-                                       #{msg.ADMIN_EDIT_USER_TITLE}
-                               </div>
-
-                               <div class="para notice">
-                                       #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
-                               </div>
-
-                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
-                                       <ui:param name="mode" value="edit" />
-                               </ui:include>
-
-                               <div class="table_footer">
-                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+
+                       <h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
+                               <div class="table">
+                                       <div class="table_header">
+                                               #{msg.ADMIN_EDIT_USER_TITLE}
+                                       </div>
+
+                                       <div class="para notice">
+                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+                                               <ui:param name="mode" value="edit" />
+                                       </ui:include>
+
+                                       <div class="table_footer">
+                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+                                       </div>
                                </div>
                        </h:form>
                </ui:define>