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.

Sign up for GitHub

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

Highlight the difference between the two simple groups #174

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Highlight the difference between the two simple groups #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f54ae68
Highlight the difference between the two simple groups
kronn Dec 1, 2024
f7dbdb9
Adapt specs to added role
kronn Dec 2, 2024
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
13 changes: 10 additions & 3 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading