Skip to content

Pro 1562 recipients order #2651

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

Merged
Tschuppi81 merged 5 commits into from
Aug 24, 2026
Merged

Pro 1562 recipients order #2651

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae078e4
Reorder recipient options
BreathingFlesh Jun 23, 2026
82ceba6
Merge branch 'master' into pro-1562-recipients-order
BreathingFlesh Jul 13, 2026
c8d6401
Replace with dropdown
BreathingFlesh Jul 14, 2026
4424600
Merge branch 'master' into pro-1562-recipients-order
BreathingFlesh Jul 16, 2026
6ee25ed
Merge branch 'master' into pro-1562-recipients-order
BreathingFlesh Jul 16, 2026
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: 7 additions & 6 deletions src/onegov/feriennet/forms/notification_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from onegov.feriennet.layout import DefaultLayout
from onegov.feriennet.models import NotificationTemplate
from onegov.form import Form
from onegov.form.fields import MultiCheckboxField, HtmlField
from onegov.form.fields import (MultiCheckboxField, HtmlField,
TranslatedSelectField)
from onegov.user import User, UserCollection
from sqlalchemy import distinct, or_, and_, select, exists
from uuid import uuid4
Expand Down Expand Up @@ -62,7 +63,7 @@ class NotificationTemplateSendForm(Form):

request: FeriennetRequest

send_to = RadioField(
send_to = TranslatedSelectField(
label=_('Send to'),
choices=[
('myself', _(
Expand All @@ -74,6 +75,9 @@ class NotificationTemplateSendForm(Form):
('inactive_organisers', _(
'Organisers without occasions'
)),
('volunteers', _(
'Volunteers'
)),
('by_role', _(
'Users of a given role'
)),
Expand All @@ -92,10 +96,7 @@ class NotificationTemplateSendForm(Form):
('by_occasion', _(
'Users with attenedees that have an occasion on their '
'wish- or booking-list'
)),
(('volunteers', _(
'Volunteers'
)))
))
],
default='by_role'
)
Expand Down