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 6b921d2520ce5ba8463ac504b365ef1a4e9d86da..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>
@@ -133,10 +141,17 @@
                        <to-view-id>/admin/mobile/admin_contact_mobile_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <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.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/login.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login</from-outcome>
+                       <from-outcome>user_login</from-outcome>
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                        <redirect>1</redirect>
                </navigation-case>
@@ -206,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>
@@ -283,6 +283,17 @@
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_delete.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
                <navigation-case>
@@ -368,6 +379,10 @@
                        <from-outcome>admin_delete_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_resend_user_confirm_link</from-outcome>
+                       <to-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_lock_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
@@ -376,6 +391,10 @@
                        <from-outcome>admin_unlock_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_user_activity_log</from-outcome>
+                       <to-view-id>/admin/user/admin_user_activity_log.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_edit_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
@@ -519,6 +538,13 @@
                        <to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/mobile/admin_mobile_delete.xhtml</from-view-id>
                <navigation-case>
@@ -687,6 +713,13 @@
                        <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_activity_log.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <!--
        <factory>
                <exception-handler-factory>