From ea80d88b5167e071a1b1dcbb11f5f4f09a82140b Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 3 Feb 2016 19:34:34 +0100 Subject: [PATCH] fix form --- teleforma/forms.py | 12 ++---------- teleforma/models/crfpa.py | 2 +- teleforma/static/teleforma/css/teleforma.css | 3 +-- .../templates/registration/registration_form.html | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/teleforma/forms.py b/teleforma/forms.py index 511330db..66a253dd 100644 --- a/teleforma/forms.py +++ b/teleforma/forms.py @@ -8,13 +8,13 @@ from captcha.fields import CaptchaField class ConferenceForm(ModelForm): + class Meta: model = Conference class UserForm(ModelForm): - # first_name = forms.CharField(_('First name'), required=True) - # last_name = forms.CharField(_('Last name'), required=True) + captcha = CaptchaField() class Meta: @@ -35,14 +35,6 @@ RegistrationForm.base_fields.update(ProfileForm.base_fields) class StudentForm(ModelForm): - def has_changed(self): - """ - Overriding this, as the initial data passed to the form does not get noticed, - and so does not get saved, unless it actually changes - """ - changed_data = super(ModelForm, self).has_changed() - return bool(self.initial or changed_data) - class Meta: model = Student exclude = ['user', 'trainings', 'options'] diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py index cee3f2dc..eb436cb8 100644 --- a/teleforma/models/crfpa.py +++ b/teleforma/models/crfpa.py @@ -131,7 +131,7 @@ class Student(Model): blank=True, null=True) period = models.ForeignKey('Period', related_name='student', verbose_name=_('period'), blank=True, null=True, on_delete=models.SET_NULL) - platform_only = models.BooleanField(_('platform only'), help_text="") + platform_only = models.BooleanField(_('e-learning platform only')) application_fees = models.BooleanField(_('application fees'), blank=True) default_application_fees = 40 subscription_fees = models.FloatField(_('subscription fees'), help_text='€', blank=True, null=True) diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index d34c1283..77746eb9 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1718,7 +1718,7 @@ input,textarea{ } .register { - width: 40%; + width: 80%; font-size: 1.1em; margin-top: 1em; margin-bottom: 4em; @@ -1733,4 +1733,3 @@ input,textarea{ .register-error { color: #BB0000; } - diff --git a/teleforma/templates/registration/registration_form.html b/teleforma/templates/registration/registration_form.html index 78ef71ff..93322ca9 100644 --- a/teleforma/templates/registration/registration_form.html +++ b/teleforma/templates/registration/registration_form.html @@ -10,9 +10,11 @@
{% csrf_token %} {{ form }} +
{% for formset in inlines %} {{ formset.management_form }} {% for form in formset %} +
{{form }} {% endfor %} {% endfor %} @@ -22,5 +24,3 @@ {% endblock %} - - -- 2.39.5