Skip to content

Commit

Permalink
Highlight the difference between the two simple groups (#174)
Browse files Browse the repository at this point in the history
* Highlight the difference between the two simple groups

* Adapt specs to added role
  • Loading branch information
kronn authored Dec 2, 2024
1 parent 2e223a2 commit 172e4d1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 -->
6 changes: 5 additions & 1 deletion app/models/group/nejb_simple_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions config/locales/models.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/models/role_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
end

it 'finishes with bottom most role' do
expect(subject.last).to eq(Group::NejbSimpleGroup::DispatchAddress)
expect(subject.last).to eq(Group::NejbSimpleGroup::NewJoiner)
end
end

Expand Down

0 comments on commit 172e4d1

Please sign in to comment.