Merge pull request #225 from hitobito/feature/2401-repair-overrides

Repair Overrides

app/controllers/die_mitte/people_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#  Copyright (c) 2021, Die Mitte. This file is part of
+#  Copyright (c) 2021-2024, Die Mitte. This file is part of
 #  hitobito_die_mitte and licensed under the Affero General Public License version 3
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_die_mitte.
@@ -22,4 +22,8 @@ def list_filter_args
   def no_filter_active?
     %w(filters filter_id).none? { |k| params[k].present? }
   end
+
+  def model_scope
+    super.includes(roles: [:translations])
+  end
 end

app/helpers/people_die_mitte_helper.rb

@@ -21,10 +21,4 @@ def format_person_correspondence_language(person)
   def format_person_civil_status(person)
     t("#{PERSON_I18N_KEY_PREFIX}.civil_statuses.#{person.civil_status}")
   end
-
-  def format_person_salutation(person)
-    if person.salutation.present?
-      t("activerecord.models.salutation.available.#{person.salutation}.label")
-    end
-  end
 end

app/models/die_mitte/role.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#  Copyright (c) 2021, Die Mitte. This file is part of
+#  Copyright (c) 2021-2024, Die Mitte. This file is part of
 #  hitobito_die_mitte and licensed under the Affero General Public License version 3
 #  or later. See the COPYING file at the top-level directory or at
 #  https://github.com/hitobito/hitobito_die_mitte.
@@ -22,14 +22,15 @@ module DieMitte::Role
     alias_method_chain :to_s, :merkmal
   end
 
-  def to_s_with_merkmal(format = :default)
+  def to_s_with_merkmal(format = :default) # rubocop:disable Metrics/MethodLength
     model_name = self.class.label
     model_name = 'Merkmal' if self.class.sti_name.ends_with?('Merkmal')
 
     unless format == :short
-      model_name = label? ? "#{model_name} (#{label})" : model_name
+      model_name += " (#{label})" if label?
       model_name += " (#{formatted_delete_date})" if delete_on
     end
+
     if format == :long
       I18n.t('activerecord.attributes.role.string_long', role: model_name, group: group.to_s)
     else

app/views/roles/_label.html.haml

@@ -0,0 +1,8 @@
+= field_set_tag Role.human_attribute_name(:label) do
+  - Settings.application.languages.each do |code, name|
+    = f.labeled_input_field(:"label_#{code}",
+                            data: { provide: :typeahead, source: entry.klass.available_labels(code) },
+                            label: name)
+
+  %small.muted
+    = t('roles.fields.help_optional_label')

config/settings.yml

@@ -25,6 +25,7 @@ root_email: hitobito-die-mitte@puzzle.ch
 messages:
   personal_salutation: true
   enable_writing: true
+  body_font_size: 10.5
 
 assignments:
   enabled: true

lib/hitobito_die_mitte/wagon.rb

@@ -50,7 +50,6 @@ class Wagon < Rails::Engine
       Export::Tabular::People::PersonRow.include DieMitte::Export::Tabular::People::PersonRow
       Export::Pdf::Messages::Letter.include DieMitte::Export::Pdf::Messages::Letter
       Export::Pdf::Messages::LetterWithInvoice.include DieMitte::Export::Pdf::Messages::LetterWithInvoice
-      Export::Pdf::Messages::Letter::BODY_FONT_SIZE = 10.5
 
       MailingLists::Subscribers.prepend DieMitte::MailingLists::Subscribers