From 0482a1e7ecaf65faadd00dbae4d68bd3b6ebbb9d Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 2 Oct 2020 19:57:28 +0200 Subject: [PATCH] Bugfixes for user admin UI --- .../usersgroupsroles/UsersController.java | 3 +- .../ui/admin/users-groups-roles/users.xhtml | 110 +++++++++--------- .../main/typescript/ccm-admin/ccm-admin.ts | 3 - .../typescript/ccm-admin/filterable-list.ts | 4 + 4 files changed, 62 insertions(+), 58 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java index 72308a5ff..d61cf8743 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/usersgroupsroles/UsersController.java @@ -216,7 +216,8 @@ public class UsersController { user.setBanned(true); userRepository.save(user); return String.format( - "redirect:%s", mvc.uri("UsersController#getUsers") + //"redirect:%s", mvc.uri("UsersController#getUsers") + "redirect:users-groups-roles/users" ); } else { userDetailsModel.addMessage( diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml index 50cdb26f2..7cf4fa1e9 100644 --- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml +++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/users-groups-roles/users.xhtml @@ -1,7 +1,6 @@ ]> @@ -67,8 +66,9 @@ - - + + #{user.name} #{user.givenName} #{user.familyName} @@ -93,58 +93,60 @@ - -