Please cherry-pick:

- sorted a bit navigation rules
- added missing for fax/land-line edit/delete

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 71cf4042d6b1a5cd140946eadf33c29c9edcb916..689302fd07167625eaf3bb95fbdf77e6abec1696 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -478,6 +478,43 @@
                        <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_list.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-case>
+                       <from-outcome>admin_edit_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_mobile</from-outcome>
+                       <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/mobile/admin_mobile_delete.xhtml</from-view-id>
                <navigation-case>
@@ -490,25 +527,24 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/mobile/admin_mobile_edit.xhtml</from-view-id>
+               <from-view-id>/admin/fax/admin_fax_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>
+                       <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/mobile/admin_mobile_list.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>
+               <from-view-id>/admin/landline/admin_landline_edit.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_edit_mobile</from-outcome>
-                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+                       <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_delete_mobile</from-outcome>
-                       <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
+                       <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>