From b8b8bc1bbb84f4080d775178d48eb84d992f12a5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 16 Aug 2016 16:15:48 +0200
Subject: [PATCH] Opps, users don't have access on admin pages .. (please
 cherry-pick)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/faces-config.xml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 9375fd1d..a8068810 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -103,16 +103,6 @@
 			<from-outcome>admin_export_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_export.xhtml</to-view-id>
 		</navigation-case>
-	</navigation-rule>
-	<navigation-rule>
-		<navigation-case>
-			<from-outcome>exception</from-outcome>
-			<to-view-id>/exception.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_list_user</from-outcome>
-			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_countries</from-outcome>
 			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
@@ -121,10 +111,6 @@
 			<from-outcome>admin_list_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
 		</navigation-case>
-		<navigation-case>
-			<from-outcome>admin_list_user</from-outcome>
-			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_mobile_provider</from-outcome>
 			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
@@ -143,7 +129,15 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>login</from-outcome>
+			<to-view-id>/user/login_index.xhtml</to-view-id>
+			<redirect>1</redirect>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/guest/user/resend_link.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>login</from-outcome>
 			<to-view-id>/login/login_index.xhtml</to-view-id>
-- 
2.39.5