Continued a bit: (please cherry-pick)

- added missing navigation rule for locking users
- added missing i18n string

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 5f9e8600e8e256f4a0aedc1570264c4a253864be..3031ef63f1403d1b992a79564b069fbc59cbfb08 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,75 +2,75 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="user/login_logout.xhtml" x="2650" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_delete.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1650" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_show.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="*" x="650" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/login.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1900" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="2400" y="450" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_export.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="guest/user/resend_done.xhtml" x="2900" y="150" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="exception.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="400" y="1500" zoom="true"/>
-        <Node id="admin/user/admin_user_lock.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_cellphone_list.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="imprint.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="user/login/login_data_saved.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="user/login_logout.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="2650" y="300" zoom="true"/>
+        <Node id="privacy.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="1500" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_show.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_edit.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="*" x="150" y="300" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="2900" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_export.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="guest/user/resend_done.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="2400" y="450" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="exception.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="terms.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_lock.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_cellphone_list.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="150" y="1650" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="user/login/login_data_saved.xhtml" x="400" y="750" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 207dd6578600dfe7e3bb63ebe3aaa07f969c62f8..2efda159b8feac40267a897f641d0a5f5a3a2092 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -611,3 +611,4 @@ ADMIN_CELLPHONE_DATA_LEGEND=Mobiltelefonnummerdaten editeren:
 ADMIN_EDIT_CELLPHONE_PROVIDER=Mobilfunkanbieter \u00e4ndern:
 ADMIN_EDIT_CELLPHONE_NUMBER=Rufnummer \u00e4ndern:
 BUTTON_ADMIN_EDIT_CELLPHONE=Mobiltelefonnumer \u00e4ndern
+ADMIN_LINK_LOCK_USER=Benutzeraccount sperren

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index bdf705facb1dc0ca02223eff2dba812c980fa4ba..96b5106f0c4dae61075d9f2241cc100532f6eb08 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -611,3 +611,4 @@ ADMIN_CELLPHONE_DATA_LEGEND=Edit cell phone data:
 ADMIN_EDIT_CELLPHONE_PROVIDER=Change mobile phone provider:
 ADMIN_EDIT_CELLPHONE_NUMBER=Change call number:
 BUTTON_ADMIN_EDIT_CELLPHONE=Edit cell phone number
+ADMIN_LINK_LOCK_USER=Lock user account

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index ed85059d9540ffe02fa400e0956cacb05dde0ccc..7c66a54fd189bbe50c6ff822502c3a13ea3d6669 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -321,6 +321,10 @@
                        <from-outcome>admin_delete_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_lock_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_unlock_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>