Please cherry-pick:

- sorted navigation rules, keep mobile together

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index e398341e0b211b1801a8e1098d3eec5ad453fb65..62dd5c271e00572afd8f3703ef3885f47d9bc6da 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -390,6 +390,22 @@
                        <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_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-case>
+                       <from-outcome>admin_unlink_contact_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <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_fax</from-outcome>
                        <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
@@ -422,22 +438,6 @@
                        <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_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-case>
-                       <from-outcome>admin_unlink_contact_mobile</from-outcome>
-                       <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
-               </navigation-case>
-               <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_list.xhtml</from-view-id>