Merge branch '2023072110-fix-admin-not-seeing-overdue-casenotes' into…

… staging
Children-in-Families · Aug 1, 2023 · 3fbf027 · 3fbf027
2 parents fc7d054 + 9e6c4fe
commit 3fbf027
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -336,8 +336,8 @@ def user_clients
     @user_clients ||= if admin?
                         Client.select(:id, :slug, :given_name, :family_name, :local_given_name, :local_family_name)
                       elsif manager?
-                        client_ids = Client.where(user_id: User.self_and_subordinates(self).ids).pluck(:id)
-                        clients.where(id: client_ids).select(:id, :slug, :given_name, :family_name, :local_given_name, :local_family_name).merge(Client.select(:id, :slug, :given_name, :family_name, :local_given_name, :local_family_name))
+                        user_ability = Ability.new(self)
+                        Client.accessible_by(user_ability)
                       elsif case_worker?
                         clients.select(:id, :slug, :given_name, :family_name, :local_given_name, :local_family_name)
                       end