From 4a44a9c2160b23858eee5f2f7249d9acf2cf510d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 23 Aug 2016 14:38:18 +0200
Subject: [PATCH] Please cherry-pick: - sorted a bit navigation rules - added
 missing for fax/land-line edit/delete

---
 web/WEB-INF/faces-config.xml | 60 ++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 71cf4042..689302fd 100644
--- 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>
-- 
2.39.5