Continued a bit:

[addressbook-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 b0ee8803c78bcfe4d044e4279208018b34261f1c..8bde2fa7738815306cb80d68f6da8ef0d91d8c5e 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -60,12 +60,43 @@
                        <to-view-id>/user/login_own_addressbooks.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_logout</from-outcome>
-                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
+                       <from-outcome>login_edit_user_data</from-outcome>
+                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>basket</from-outcome>
-                       <to-view-id>/basket.xhtml</to-view-id>
+                       <from-outcome>user_profile</from-outcome>
+                       <to-view-id>/user/user_profile.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_countries</from-outcome>
+                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_export_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_export.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-case>
+                       <from-outcome>admin_list_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_export_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_export.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/login.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>login</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>exception</from-outcome>
@@ -350,6 +381,13 @@
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/contact/admin_contact_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/contact/admin_contact_edit.xhtml</from-view-id>
                <navigation-case>
@@ -357,6 +395,20 @@
                        <to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/contact/admin_contact_export.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_export.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>