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 8d8ad92a3ba2f95ac1c8beae1cf4bcf3dd4b6f2a..e640f6a73608e10464b40693b65a74e6ed906aad 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -222,14 +222,14 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_password.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_password.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
                        <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_email_address.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_email_address.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_contact_data_saved</from-outcome>
                        <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
@@ -240,7 +240,7 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_personal_data.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
                        <to-view-id>/user/login_data_saved.xhtml</to-view-id>
@@ -256,6 +256,10 @@
                        <from-outcome>admin_delete_country</from-outcome>
                        <to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_country</from-outcome>
+                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>