Browse Source

feat: add absorbed orgs to filter options, make unique

pull/1789/head
natdeanlewissoftwire 3 years ago
parent
commit
5c845794f0
  1. 4
      app/helpers/filters_helper.rb

4
app/helpers/filters_helper.rb

@ -45,7 +45,7 @@ module FiltersHelper
end end
def owning_organisations_filter_options(user) 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) } [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) }
end end
@ -69,7 +69,7 @@ module FiltersHelper
end end
def managing_organisation_filter_options(user) 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) } [OpenStruct.new(id: "", name: "Select an option")] + organisation_options.map { |org| OpenStruct.new(id: org.id, name: org.name) }
end end

Loading…
Cancel
Save