Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Also protect the password forgotten form with recaptcha

Roland Geider0aae00b8db0e
diff --git a/wger/core/forms.py b/wger/core/forms.py
index 45545282a..8c1dc1422 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -32,7 +32,6 @@ from django.forms import (
EmailField,
Form,
PasswordInput,
- widgets,
)
from django.utils.translation import (
gettext as _,
@@ -349,3 +348,14 @@ class PasswordResetFormCaptcha(PasswordResetForm):
label='reCaptcha',
help_text=gettext_lazy('The form is secured with reCAPTCHA'),
)
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.form_class = 'wger-form'
+ self.helper.layout = Layout(
+ 'email',
+ 'captcha',
+ ButtonHolder(Submit('submitBtn', _('Submit'), css_class='btn-success btn-block')),
+ )
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index e3d437086..3e94a2992 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -632,11 +632,15 @@ class WgerPasswordResetView(PasswordResetView):
return PasswordResetForm
def get_form(self, form_class=None):
- form = super().get_form(form_class)
- form.helper = FormHelper()
- form.helper.form_class = 'wger-form'
- form.helper.add_input(Submit('submit', _('Save'), css_class='btn-success btn-block'))
- return form
+ # Massage django's default form. Our form already has a helper.
+ if not settings.WGER_SETTINGS['USE_RECAPTCHA']:
+ form = super().get_form(form_class)
+ form.helper = FormHelper()
+ form.helper.form_class = 'wger-form'
+ form.helper.add_input(Submit('submit', _('Save'), css_class='btn-success btn-block'))
+ return form
+
+ return super().get_form(form_class)
class WgerPasswordResetConfirmView(PasswordResetConfirmView):