Skip to content
Snippets Groups Projects

Resolve "Info mailing"

Merged Nik | Klampfradler requested to merge 17-info-mailing into master
3 files
+ 21
6
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -11,7 +11,7 @@ from phonenumber_field.formfields import PhoneNumberField
@@ -11,7 +11,7 @@ from phonenumber_field.formfields import PhoneNumberField
from aleksis.core.mixins import ExtensibleForm
from aleksis.core.mixins import ExtensibleForm
from aleksis.core.models import Group, Person
from aleksis.core.models import Group, Person
from .models import Event, EventRegistration, Terms, Voucher
from .models import Event, EventRegistration, InfoMailing, Terms, Voucher
COMMENT_CHOICES = [
COMMENT_CHOICES = [
("first", _("Only first name")),
("first", _("Only first name")),
@@ -49,6 +49,7 @@ class EditEventForm(ExtensibleForm):
@@ -49,6 +49,7 @@ class EditEventForm(ExtensibleForm):
Fieldset(_("Date data"), Row("date_event", "date_registration", "date_retraction")),
Fieldset(_("Date data"), Row("date_event", "date_registration", "date_retraction")),
Fieldset(_("Event details"), Row("cost", "max_participants"), "information"),
Fieldset(_("Event details"), Row("cost", "max_participants"), "information"),
Fieldset(_("Terms"), "terms"),
Fieldset(_("Terms"), "terms"),
 
Fieldset(_("Info mailings"), "info_mailings"),
),
),
)
)
@@ -68,6 +69,7 @@ class EditEventForm(ExtensibleForm):
@@ -68,6 +69,7 @@ class EditEventForm(ExtensibleForm):
"max_participants",
"max_participants",
"terms",
"terms",
"information",
"information",
 
"info_mailings",
]
]
widgets = {
widgets = {
"linked_group": ModelSelect2Widget(
"linked_group": ModelSelect2Widget(
@@ -78,6 +80,10 @@ class EditEventForm(ExtensibleForm):
@@ -78,6 +80,10 @@ class EditEventForm(ExtensibleForm):
search_fields=["aspect__icontains"],
search_fields=["aspect__icontains"],
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
),
),
 
"info_mailings": ModelSelect2MultipleWidget(
 
search_fields=["subject__icontains"],
 
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
 
),
}
}
@@ -456,3 +462,17 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
@@ -456,3 +462,17 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
"The username must only contain lower case letters and numbers, "
"The username must only contain lower case letters and numbers, "
"and must begin with a letter."
"and must begin with a letter."
)
)
 
 
 
class EditInfoMailingForm(forms.ModelForm):
 
 
layout = Layout(
 
Row("sender", "reply_to", "active"),
 
Row("send_to_person", "send_to_guardians"),
 
Row("subject"),
 
Row("text"),
 
)
 
 
class Meta:
 
model = InfoMailing
 
exclude = ["sent_to"]
Loading