Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/rails-update-7.1 #156

Merged
merged 3 commits into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/group/kreis_geschaeftsstelle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ class Staff < Role::GeschaeftsstelleStaff
class Help < Role::GeschaeftsstelleHelp
end

self.default_role = Staff
self.standard_role = Staff
roles Manager, Staff, Help
end
2 changes: 1 addition & 1 deletion app/models/group/kreis_kontakte.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Kontakt < Role::Kontakt
end

self.default_role = Kontakt
self.standard_role = Kontakt
roles Adressverwaltung, Kontakt
end
2 changes: 1 addition & 1 deletion app/models/group/kreis_musikkommission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ class Praesident < Role::MusikkommissionPraesident
class Mitglied < Role::MusikkommissionMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/kreis_vorstand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ class Veteranenchef < Role::VorstandVeteranenchef
class Mitglied < Role::VorstandMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, VizePraesident, Kassier, Veteranenchef, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_arbeitsgruppe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Leitung < Role::ArbeitsgruppeLeitung
class Mitglied < Role::ArbeitsgruppeMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Leitung, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_geschaeftsstelle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ class Staff < Role::GeschaeftsstelleStaff
class Help < Role::GeschaeftsstelleHelp
end

self.default_role = Staff
self.standard_role = Staff
roles Manager, Staff, Help
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_kontakte.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Kontakt < Role::Kontakt
end

self.default_role = Kontakt
self.standard_role = Kontakt
roles Adressverwaltung, Kontakt
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_musikkommission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ class Praesident < Role::MusikkommissionPraesident
class Mitglied < Role::MusikkommissionMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_veteranen.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ class Veteran < Role
class Ehrenveteran < Role
end

self.default_role = Veteran
self.standard_role = Veteran
roles Veteran, Ehrenveteran
end
2 changes: 1 addition & 1 deletion app/models/group/mitgliederverband_vorstand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ class Veteranenchef < Role::VorstandVeteranenchef
class Mitglied < Role::VorstandMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, VizePraesident, Kassier, Veteranenchef, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/regionalverband_arbeitsgruppe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Leitung < Role::ArbeitsgruppeLeitung
class Mitglied < Role::ArbeitsgruppeMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Leitung, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/regionalverband_geschaeftsstelle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ class Staff < Role::GeschaeftsstelleStaff
class Help < Role::GeschaeftsstelleHelp
end

self.default_role = Staff
self.standard_role = Staff
roles Manager, Staff, Help
end
2 changes: 1 addition & 1 deletion app/models/group/regionalverband_kontakte.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Kontakt < Role::Kontakt
end

self.default_role = Kontakt
self.standard_role = Kontakt
roles Adressverwaltung, Kontakt
end
2 changes: 1 addition & 1 deletion app/models/group/regionalverband_musikkommission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ class Praesident < Role::MusikkommissionPraesident
class Mitglied < Role::MusikkommissionMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/regionalverband_vorstand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ class Veteranenchef < Role::VorstandVeteranenchef
class Mitglied < Role::VorstandMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, VizePraesident, Kassier, Veteranenchef, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/root_arbeitsgruppe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Leitung < Role::ArbeitsgruppeLeitung
class Mitglied < Role::ArbeitsgruppeMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Leitung, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/root_ehrenmitglieder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Ehrenmitglied < Role::Ehrenmitglied
end

self.default_role = Ehrenmitglied
self.standard_role = Ehrenmitglied
roles Adressverwaltung, Ehrenmitglied
end
2 changes: 1 addition & 1 deletion app/models/group/root_geschaeftsstelle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ class Staff < Role::GeschaeftsstelleStaff
class Help < Role::GeschaeftsstelleHelp
end

self.default_role = Staff
self.standard_role = Staff
roles Manager, Staff, Help
end
2 changes: 1 addition & 1 deletion app/models/group/root_kontakte.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Kontakt < Role::Kontakt
end

self.default_role = Kontakt
self.standard_role = Kontakt
roles Adressverwaltung, Kontakt
end
2 changes: 1 addition & 1 deletion app/models/group/root_musikkommission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ class Praesident < Role::MusikkommissionPraesident
class Mitglied < Role::MusikkommissionMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/root_veteranen.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ class Ehrenveteran < Role
class CismVeteran < Role
end

self.default_role = Veteran
self.standard_role = Veteran
roles Veteran, Ehrenveteran, CismVeteran
end
2 changes: 1 addition & 1 deletion app/models/group/root_vorstand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ class Veteranenchef < Role::VorstandVeteranenchef
class Mitglied < Role::VorstandMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, VizePraesident, Finanzchef, Veteranenchef, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/verein_arbeitsgruppe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Leitung < Role::ArbeitsgruppeLeitung
class Mitglied < Role::ArbeitsgruppeMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Leitung, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/verein_geschaeftsstelle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ class Staff < Role::GeschaeftsstelleStaff
class Help < Role::GeschaeftsstelleHelp
end

self.default_role = Staff
self.standard_role = Staff
roles Manager, Staff, Help
end
2 changes: 1 addition & 1 deletion app/models/group/verein_kontakte.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ class Adressverwaltung < Role::Adressverwaltung
class Kontakt < Role::Kontakt
end

self.default_role = Kontakt
self.standard_role = Kontakt
roles Adressverwaltung, Kontakt
end
2 changes: 1 addition & 1 deletion app/models/group/verein_mitglieder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ class Passivmitglied < Role::MitgliederPassivmitglied
class Ehrenmitglied < Role::Ehrenmitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Adressverwaltung, Mitglied, Passivmitglied, Ehrenmitglied
end
2 changes: 1 addition & 1 deletion app/models/group/verein_musikkommission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ class Praesident < Role::MusikkommissionPraesident
class Mitglied < Role::MusikkommissionMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, Mitglied
end
2 changes: 1 addition & 1 deletion app/models/group/verein_vorstand.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ class Materialverwaltung < Role::VorstandMaterialverwaltung
class Mitglied < Role::VorstandMitglied
end

self.default_role = Mitglied
self.standard_role = Mitglied
roles Praesident, VizePraesident, Kassier, Veteranenchef, Materialverwaltung, Mitglied
end
3 changes: 3 additions & 0 deletions lib/hitobito_sbv/wagon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ class Wagon < Rails::Engine
initializer "sbv.add_inflections" do |_app|
ActiveSupport::Inflector.inflections do |inflect|
inflect.irregular "song_census", "song_censuses"
inflect.plural "klasse", "klassen"
inflect.plural "unterhaltungsmusik", "unterhaltungsmusik_stufen"
inflect.plural "besetzung", "besetzungen"
end
end

Expand Down
Loading