Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / faces-config.xml

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index e01217a23aedf3860ef0aa50b64c1237c70346b8..ee336973e6d805980e6b9977c752d608ac63e4de 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -65,8 +65,16 @@
                        <to-view-id>/guest/user/resend_link.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_edit_user_data</from-outcome>
-                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+                       <from-outcome>user_change_email_address</from-outcome>
+                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_change_password</from-outcome>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_change_personal_data</from-outcome>
+                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_profile</from-outcome>
@@ -137,7 +145,7 @@
                <from-view-id>/user/login_index.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_change_password</from-outcome>
-                       <to-view-id>/user/login_change_password</to-view-id>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
@@ -213,21 +221,6 @@
                        <to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
-       <navigation-rule>
-               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
-               <navigation-case>
-                       <from-outcome>user_change_email_address</from-outcome>
-                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>user_change_password</from-outcome>
-                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>user_change_personal_data</from-outcome>
-                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
-               </navigation-case>
-       </navigation-rule>
        <navigation-rule>
                <from-view-id>/user/login_change_password.xhtml</from-view-id>
                <navigation-case>