Merge branch 'master' into feature/btcpay_configs

2023-09-20 19:12:24 +02:00
parent 69fffb29d8 7a5fd46835
commit d939f5d649
30 changed files with 352 additions and 41 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -20,6 +20,8 @@ class Admin::UsersController < Admin::BaseController
    end

    @services_enabled = @user.services_enabled
+
+    @avatar = LdapManager::FetchAvatar.call(cn: @user.cn, ou: @user.ou)
  end

  private