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 0d3ed4ef6d1e076847cf5bd169ed6b656f376982..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>
@@ -702,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>