Please cherry-pick:

- added missing navigation rules for admin_user_show to fax and land-line

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a8068810ebe81ba9a49f14c5ffcbcbb6e3ceb9d2..e398341e0b211b1801a8e1098d3eec5ad453fb65 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -323,6 +323,38 @@
                        <from-outcome>admin_delete_mobile</from-outcome>
                        <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_edit_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>