]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Thu, 25 Aug 2016 14:45:00 +0000 (16:45 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 25 Aug 2016 18:36:38 +0000 (20:36 +0200)
- added missing navigation rule to admin_show_user
- added missing i18n strings

src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml

index 1feae44ce31b29fc60255c4767a91a036da141dd..d3592ed7270b1fbdf9a8d3771277b4644225b2b8 100644 (file)
@@ -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:
index 188518035338c530edb01a4c7f6d41bffc7e1b07..21e71bef0415ae7f74a1eb3c50b59fdff4cfd159 100644 (file)
@@ -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:
index ed5b92c8e44d1c6f990fc7dee574ea7d9588fe7c..bda2c66934e734405229fd1b6fe2336794c5aff7 100644 (file)
                        <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>