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 3b5c96f7c35966a8fcf9ed6302f44ff3835892ef..982cd10c665c9ff9e61fb066a9dcdb814c7ce622 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -283,6 +283,7 @@
                        <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_list.xhtml</from-view-id>
                <navigation-case>
@@ -368,6 +369,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,10 +381,18 @@
                        <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>
                </navigation-case>
+               <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_show.xhtml</from-view-id>
@@ -493,6 +506,67 @@
                        <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_fax_delete.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_fax_provider</from-outcome>
+                       <to-view-id>/admin/fax_provider/admin_fax_provider_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_delete.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_landline_provider</from-outcome>
+                       <to-view-id>/admin/landline_provider/admin_landline_provider_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_landline</from-outcome>
+                       <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>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_fax_edit.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_edit.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_edit.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/fax/admin_fax_show.xhtml</from-view-id>
                <navigation-case>
@@ -596,6 +670,10 @@
                        <from-outcome>admin_show_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/contact/admin_contact_list.xhtml</from-view-id>
@@ -625,6 +703,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>