From f54ae68d6e2b646de5f142fb8278e0840d45fda9 Mon Sep 17 00:00:00 2001 From: Matthias Viehweger Date: Sun, 1 Dec 2024 22:19:10 +0100 Subject: [PATCH] Highlight the difference between the two simple groups --- README.md | 13 ++++++++++--- app/models/group/nejb_simple_group.rb | 6 +++++- config/locales/models.de.yml | 5 +++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c8963b5..510f1e1 100644 --- a/README.md +++ b/README.md @@ -197,8 +197,8 @@ Additional features include member census, camps and course conditions. * Neumitglied: [] * Extern: [] * Versandadresse: [] - * Ehemaligenschar - * Ehemaligenschar + * Ehemaligenverein (Schar) + * Ehemaligenverein (Schar) * Leitung: [:group_and_below_full, :contact_data] * Adressverwaltung: [:group_and_below_full] * Kassier*in: [:group_and_below_read] @@ -214,6 +214,13 @@ Additional features include member census, camps and course conditions. * Ehemalig: [:group_read] * Extern: [] * Versandadresse: [] + * Einfache Gruppe (Ehemalige) + * Leitung: [:group_full] + * Mitglied Ehemalige: [:group_read] + * Adressverwaltung: [] + * Extern: [] + * Versandadresse: [] + * Neumitglied: [] (Output of rake app:hitobito:roles) - + \ No newline at end of file diff --git a/app/models/group/nejb_simple_group.rb b/app/models/group/nejb_simple_group.rb index e87efdb..cd7b010 100644 --- a/app/models/group/nejb_simple_group.rb +++ b/app/models/group/nejb_simple_group.rb @@ -58,8 +58,12 @@ class External < NejbRole self.kind = :external end + class NewJoiner < NejbRole + self.permissions = [] + end + class DispatchAddress < NejbRole end - roles Leader, Member, GroupAdmin, External, DispatchAddress + roles Leader, Member, GroupAdmin, External, DispatchAddress, NewJoiner end diff --git a/config/locales/models.de.yml b/config/locales/models.de.yml index 5606ca0..3fac97e 100644 --- a/config/locales/models.de.yml +++ b/config/locales/models.de.yml @@ -24,7 +24,7 @@ de: other: Regionen group/regional_board: Regionalleitung group/simple_group: Einfache Gruppe - group/nejb_simple_group: Einfache Gruppe + group/nejb_simple_group: Einfache Gruppe (Ehemalige) group/state_agency: Arbeitsstelle group/alumnus_group: one: Ehemalige @@ -295,7 +295,8 @@ de: long: Versandadresse Einfache Gruppe group/nejb_simple_group/group_admin: Adressverwaltung - group/nejb_simple_group/member: Mitglied + group/nejb_simple_group/member: Mitglied Ehemalige + group/nejb_simple_group/new_joiner: Neumitglied group/nejb_simple_group/external: Extern group/nejb_simple_group/leader: Leitung