From 5c845794f0851066b4e6545b8113a07ca73835b9 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 21 Jul 2023 09:15:52 +0100 Subject: [PATCH] feat: add absorbed orgs to filter options, make unique --- app/helpers/filters_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 439f0ab7e..dee4e352a 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -45,7 +45,7 @@ module FiltersHelper end def owning_organisations_filter_options(user) - organisation_options = user.support? ? Organisation.all : ([user.organisation] + user.organisation.stock_owners + user.organisation.absorbed_organisations.flat_map(&:stock_owners)).uniq + organisation_options = user.support? ? Organisation.all : ([user.organisation] + user.organisation.stock_owners + user.organisation.absorbed_organisations).uniq [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) } end @@ -69,7 +69,7 @@ module FiltersHelper end def managing_organisation_filter_options(user) - organisation_options = user.support? ? Organisation.all : [user.organisation] + user.organisation.managing_agents + user.organisation.absorbed_organisations.flat_map(&:managing_agents) + organisation_options = user.support? ? Organisation.all : ([user.organisation] + user.organisation.managing_agents + user.organisation.absorbed_organisations).uniq [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) } end