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 d87c6c779f55a0d7becc9a38da8bc479b92e9551..fe9534eddd0b32cab7683464d55bb8408843f120 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -713,8 +713,8 @@
        <navigation-rule>
                <from-view-id>/admin/basic_company_data/admin_basic_company_data_list.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_show_basic_company_data</from-outcome>
-                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign.xhtml</to-view-id>
+                       <from-outcome>admin_show_basic_data</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_assign_basic_company_data_contact</from-outcome>
@@ -728,9 +728,41 @@
                        <from-outcome>admin_assign_basic_company_data_owner</from-outcome>
                        <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign_owner.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_business_employee</from-outcome>
+                       <to-view-id>/admin/company_employee/admin_company_employee_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_basic_company_data_employee</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_assign_employee.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/branch_offices/admin_branch_offices_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_branch_office</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_show.xhtml</to-view-id>
+               </navigation-case>
+               <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_assign_branch_office_owner</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_assign_owner.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_basic_data</from-outcome>
+                       <to-view-id>/admin/basic_company_data/admin_basic_company_data_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_business_employee</from-outcome>
+                       <to-view-id>/admin/company_employee/admin_company_employee_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_branch_office_employee</from-outcome>
+                       <to-view-id>/admin/branch_offices/admin_branch_office_assign_employee.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <!--
        <factory>