Highlight the difference between the two simple groups

hitobito · Dec 1, 2024 · f54ae68 · f54ae68
1 parent 2e223a2
commit f54ae68
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git 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)
-<!-- roles:end -->
+<!-- roles:end -->
diff --git 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
@@ -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