From 2bad28ace0cbfcbb9aba90d063bbd9d62713376c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 20 May 2020 18:42:59 +0200 Subject: [PATCH] Please cherry-pick: - renamed userCreated -> userEntryCreated - renamed userUpdated -> userEntryUpdated - updateUserData() may throw a checked UserNotFoundException, let's catch it here and throw a FacesException with it as cause - same with confirmAccount() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jbonuscard-core.jar | Bin 0 -> 10916 bytes .../beans/user/JobsAdminUserWebRequestBean.java | 12 ++++++++++-- .../JobsConfirmationLinkWebRequestBean.java | 3 ++- .../admin/user/admin_show_user_data.tpl | 8 ++++---- .../admin/user/admin_show_user_data_mini.tpl | 4 ++-- web/admin/user/admin_user_activity_log.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 9 ++++----- web/guest/user/user_list.xhtml | 2 +- 8 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 lib/jbonuscard-core.jar diff --git a/lib/jbonuscard-core.jar b/lib/jbonuscard-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..2aa8f1a660334f7e17265433ecb5be4f04973100 GIT binary patch literal 10916 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

D%%Jl-L9_mw&4?Yd&qp!e&ffqbsL zw1ro^p0$}8j>4*DbL9-2mB;l;Y5uAo=z z9A% - + - + - + - + diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl index 23db73bd..b6a0db4d 100644 --- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl @@ -46,9 +46,9 @@ - + - + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 9a7cf4cf..b3e24ed4 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -117,7 +117,7 @@ - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index a3fed78d..425ae0d4 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -241,20 +241,20 @@ - + - + @@ -358,7 +358,6 @@ - + -- 2.39.5