src/pyams_default_theme/shared/form/__init__.py
changeset 503 29368086be32
parent 489 41766d8b53d7
--- a/src/pyams_default_theme/shared/form/__init__.py	Mon Oct 21 11:49:29 2019 +0200
+++ b/src/pyams_default_theme/shared/form/__init__.py	Wed Oct 23 14:51:35 2019 +0200
@@ -86,18 +86,20 @@
     def fields(self):
 
         def get_fields():
+            form = self.context
             token = TextLine(title=_("CSRF token"), required=True)
             token.__name__ = CSRF_FIELD_NAME
             yield token
-            if self.context.use_captcha:
+            captcha_settings = form.get_captcha_settings()
+            if captcha_settings.get('use_captcha'):
                 captcha = TextLine(title=_("Captcha"), required=True)
                 captcha.__name__ = RECAPTCHA_FIELD_NAME
                 yield captcha
-            yield from IFormFieldContainer(self.context).get_fields()
+            yield from IFormFieldContainer(form).get_fields()
             if self.context.rgpd_consent:
                 consent = Bool(title=' ',
-                               description=II18n(self.context).query_attribute('rgpd_warning',
-                                                                               request=self.request),
+                               description=II18n(form).query_attribute('rgpd_warning',
+                                                                       request=self.request),
                                required=True,
                                default=False)
                 consent.__name__ = RGPD_CONSENT_FIELD_NAME