Merge branch 'master' into feature/ldap_services

2023-03-01 09:35:53 +00:00
parent 75ffd4e2f1 1d2910dadb
commit 2861254adf
15 changed files with 318 additions and 11 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -6,7 +6,7 @@ class Admin::UsersController < Admin::BaseController
    ldap   = LdapService.new
    @ou    = params[:ou] || "kosmos.org"
    @orgs  = ldap.fetch_organizations
-    @users = User.where(ou: @ou).order(cn: :asc).to_a
+    @pagy, @users = pagy(User.where(ou: @ou).order(cn: :asc))

    @stats = {
      users_confirmed: User.where(ou: @ou).confirmed.count,