From 94c7ade79494b5e9b11336cbec1e2401f408082f Mon Sep 17 00:00:00 2001 From: Ferran Quer Guerrero Date: Thu, 13 Feb 2020 19:49:05 +0100 Subject: [PATCH 1/3] disable recaptcha. Better spammed than googled --- easy_my_coop_website/__manifest__.py | 1 - easy_my_coop_website/controllers/main.py | 17 ++--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/easy_my_coop_website/__manifest__.py b/easy_my_coop_website/__manifest__.py index 0067100..6d766d4 100644 --- a/easy_my_coop_website/__manifest__.py +++ b/easy_my_coop_website/__manifest__.py @@ -9,7 +9,6 @@ "depends": [ "easy_my_coop", "website", - "website_recaptcha_reloaded", ], "author": "Coop IT Easy SCRLfs", "category": "Cooperative management", diff --git a/easy_my_coop_website/controllers/main.py b/easy_my_coop_website/controllers/main.py index 1a51c46..182aa37 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -207,21 +207,8 @@ class WebsiteSubscription(http.Controller): redirect = "easy_my_coop_website.becomecompanycooperator" email = kwargs.get('company_email') - if 'g-recaptcha-response' not in kwargs or kwargs['g-recaptcha-response'] == '': - values = self.fill_values(values, is_company, logged) - values.update(kwargs) - values["error_msg"] = _("the captcha has not been validated," - " please fill in the captcha") - - return request.render(redirect, values) - elif not request.website.is_captcha_valid( - kwargs['g-recaptcha-response']): - values = self.fill_values(values, is_company, logged) - values.update(kwargs) - values["error_msg"] = _("the captcha has not been validated," - " please fill in the captcha") - - return request.render(redirect, values) + # Original place for Google Captcha. + # Maybe https://github.com/lepture/captcha could help on replacing it # Check that required field from model subscription_request exists required_fields = sub_req_obj.sudo().get_required_field() From 32e61b833d6c82ad72787bdc5c13f6969a02a691 Mon Sep 17 00:00:00 2001 From: Ferran Quer Guerrero Date: Fri, 14 Feb 2020 12:44:31 +0100 Subject: [PATCH 2/3] Comment recaptcha dependency --- easy_my_coop_website/__manifest__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/easy_my_coop_website/__manifest__.py b/easy_my_coop_website/__manifest__.py index 6d766d4..ae4603f 100644 --- a/easy_my_coop_website/__manifest__.py +++ b/easy_my_coop_website/__manifest__.py @@ -9,6 +9,7 @@ "depends": [ "easy_my_coop", "website", + # "website_recaptcha_reloaded", ], "author": "Coop IT Easy SCRLfs", "category": "Cooperative management", From fdb521eb52cf0e0dba1ea1e28a12c5c5b3d63b0a Mon Sep 17 00:00:00 2001 From: Ferran Quer Guerrero Date: Fri, 14 Feb 2020 15:43:28 +0100 Subject: [PATCH 3/3] Disable recaptcha at templates --- easy_my_coop_website/views/subscription_template.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easy_my_coop_website/views/subscription_template.xml b/easy_my_coop_website/views/subscription_template.xml index b4cf9a3..94df921 100644 --- a/easy_my_coop_website/views/subscription_template.xml +++ b/easy_my_coop_website/views/subscription_template.xml @@ -297,7 +297,7 @@
-

+
@@ -618,7 +618,7 @@
-

+