From 197a3ba74923ecd12075ba3c03e5410ce5af47ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20L=C3=B3pez=20Ram=C3=ADrez?= Date: Tue, 16 Jun 2020 13:06:34 +0200 Subject: [PATCH] Captcha showing only if option active --- easy_my_coop_website/__manifest__.py | 2 +- easy_my_coop_website/controllers/main.py | 50 ++++++++++--------- .../views/subscription_template.xml | 2 + 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/easy_my_coop_website/__manifest__.py b/easy_my_coop_website/__manifest__.py index d8945b6..cb024a5 100644 --- a/easy_my_coop_website/__manifest__.py +++ b/easy_my_coop_website/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Easy My Coop Website", - "version": "12.0.1.0.0", + "version": "12.0.1.0.3", "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 ce8ff2e..a5ac213 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -173,7 +173,10 @@ class WebsiteSubscription(http.Controller): sub_req_obj = request.env["subscription.request"] company = request.website.company_id products = self.get_products_share(is_company) - + icp_obj = request.env["ir.config_parameter"].sudo() + values["recaptcha_enabled"] = icp_obj.get_param( + "emc_website.captcha_enabled", default="True" + ) if load_from_user: values = self.get_values_from_user(values, is_company) if is_company: @@ -245,7 +248,7 @@ class WebsiteSubscription(http.Controller): def validation(self, kwargs, logged, values, post_file): user_obj = request.env["res.users"] sub_req_obj = request.env["subscription.request"] - + icp_obj = request.env["ir.config_parameter"].sudo() redirect = "easy_my_coop_website.becomecooperator" email = kwargs.get("email") @@ -256,29 +259,30 @@ 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" - ) + if icp_obj.get_param('emc_website.captcha_enabled')=="True": + 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) + 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) + return request.render(redirect, values) # Check that required field from model subscription_request exists required_fields = sub_req_obj.sudo().get_required_field() diff --git a/easy_my_coop_website/views/subscription_template.xml b/easy_my_coop_website/views/subscription_template.xml index c107440..963eea1 100644 --- a/easy_my_coop_website/views/subscription_template.xml +++ b/easy_my_coop_website/views/subscription_template.xml @@ -473,10 +473,12 @@
+

+