From b8ebe2162405e2bcd786622cfede19cfe88214b4 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 21 Feb 2024 14:17:46 +0000 Subject: [PATCH] Add parent schemes to the user model directly --- app/jobs/scheme_email_csv_job.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/scheme_email_csv_job.rb b/app/jobs/scheme_email_csv_job.rb index b731a1921..9c3060cb9 100644 --- a/app/jobs/scheme_email_csv_job.rb +++ b/app/jobs/scheme_email_csv_job.rb @@ -9,7 +9,7 @@ class SchemeEmailCsvJob < ApplicationJob unfiltered_schemes = if organisation.present? && user.support? Scheme.where(owning_organisation: [organisation] + organisation.parent_organisations) else - Scheme.where(owning_organisation: [user.organisation] + user.organisation.parent_organisations) + user.schemes end filtered_schemes = FilterManager.filter_schemes(unfiltered_schemes, search_term, filters, all_orgs, user) csv_string = Csv::SchemeCsvService.new(download_type:).prepare_csv(filtered_schemes) diff --git a/app/models/user.rb b/app/models/user.rb index aba948425..0fc21172a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -113,7 +113,7 @@ class User < ApplicationRecord if support? Scheme.all else - Scheme.filter_by_owning_organisation(organisation.absorbed_organisations + [organisation]) + Scheme.filter_by_owning_organisation(organisation.absorbed_organisations + [organisation] + organisation.parent_organisations) end end