From: Roland Häder <roland@mxchange.org>
Date: Thu, 25 Aug 2016 14:45:00 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7c84f3243b4db5a709a24c048671e8813ec57f89;p=jjobs-war.git

Please cherry-pick:
- added missing navigation rule to admin_show_user
- added missing i18n strings
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 1feae44c..d3592ed7 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -735,3 +735,4 @@ ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE=M\u00f6chten Sie dem Benutzer {0} (Id-
 ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE=Durch das Zuschicken eines neuen Best\u00e4tigungslinkes wird der alte ung\u00fcltig und nur noch der neue Link kann verwendet werden.
 PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Neuen Best\u00e4tigungslink versenden
 CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Neuen Best\u00e4tigungslink versenden:
+ADMIN_SHOW_USER_ID=Benutzer-Id:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 18851803..21e71bef 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -736,3 +736,4 @@ ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE=Do you want to send a new confirmation
 ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE=By sending a new confirmation link to the user, the old link becomes invalid and only the new link can be used.
 PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Send new confirmation link
 CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Send new confirmation link:
+ADMIN_SHOW_USER_ID=User id:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index ed5b92c8..bda2c669 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -523,6 +523,13 @@
 			<to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_user</from-outcome>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/mobile/admin_mobile_delete.xhtml</from-view-id>
 		<navigation-case>