Allow to overwrite the correspondence-language with a filter-chain

hitobito · Feb 13, 2025 · 15a171d · 15a171d
1 parent 782bd5f
commit 15a171d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/domain/die_mitte/mailing_lists/subscribers.rb b/app/domain/die_mitte/mailing_lists/subscribers.rb
@@ -12,6 +12,7 @@ def people
 
   def correspondence_language_condition
     return {} if @list.correspondence_language.blank?
+    return {} if @list.filter_chain.filters.any? { |filter| filter.attr == "language" }
 
     {correspondence_language: @list.correspondence_language}
   end

diff --git a/spec/domain/mailing_list/subscribers_spec.rb b/spec/domain/mailing_list/subscribers_spec.rb
@@ -26,6 +26,14 @@
       expect(list.people).to have(2).items
     end
 
+    it "includes two people if set but with a more specific filter-chain" do
+      list.update(correspondence_language: :fr)
+      list.update(filter_chain: {language: {allowed_values: [:fr, :de]}})
+
+      expect(list.people).to have(2).items
+    end
+
+
     it "includes single perosn when set" do
       list.update(correspondence_language: :de)
       expect(list.people).to eq [other]