From 99286cef255e98e9103a25e54195b47fd17140f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20L=C3=B3pez=20Ram=C3=ADrez?= Date: Mon, 29 Jun 2020 13:24:34 +0200 Subject: [PATCH] Captcha flag set to company --- easy_my_coop_website/__init__.py | 1 + easy_my_coop_website/__manifest__.py | 1 + easy_my_coop_website/controllers/main.py | 2 +- easy_my_coop_website/models/__init__.py | 1 + easy_my_coop_website/models/company.py | 10 ++++++++++ easy_my_coop_website/views/res_company_view.xml | 14 ++++++++++++++ .../views/subscription_template.xml | 3 ++- 7 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 easy_my_coop_website/models/__init__.py create mode 100644 easy_my_coop_website/models/company.py create mode 100644 easy_my_coop_website/views/res_company_view.xml diff --git a/easy_my_coop_website/__init__.py b/easy_my_coop_website/__init__.py index e046e49..91c5580 100644 --- a/easy_my_coop_website/__init__.py +++ b/easy_my_coop_website/__init__.py @@ -1 +1,2 @@ from . import controllers +from . import models diff --git a/easy_my_coop_website/__manifest__.py b/easy_my_coop_website/__manifest__.py index 03c04a1..c665b87 100644 --- a/easy_my_coop_website/__manifest__.py +++ b/easy_my_coop_website/__manifest__.py @@ -17,6 +17,7 @@ """, "data": [ "views/subscription_template.xml", + "views/res_company_view.xml", "data/website_cooperator_data.xml", ], "installable": True, diff --git a/easy_my_coop_website/controllers/main.py b/easy_my_coop_website/controllers/main.py index e6acfcf..5f687d6 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -256,7 +256,7 @@ class WebsiteSubscription(http.Controller): redirect = "easy_my_coop_website.becomecompanycooperator" email = kwargs.get("company_email") - if request.website.recaptcha_key_site: + if request.website.company_id.captcha_type == 'google': if ( "g-recaptcha-response" not in kwargs or kwargs["g-recaptcha-response"] == "" diff --git a/easy_my_coop_website/models/__init__.py b/easy_my_coop_website/models/__init__.py new file mode 100644 index 0000000..52e1016 --- /dev/null +++ b/easy_my_coop_website/models/__init__.py @@ -0,0 +1 @@ +from . import company diff --git a/easy_my_coop_website/models/company.py b/easy_my_coop_website/models/company.py new file mode 100644 index 0000000..31166e7 --- /dev/null +++ b/easy_my_coop_website/models/company.py @@ -0,0 +1,10 @@ +from odoo import api, fields, models + + +class ResCompany(models.Model): + _inherit = 'res.company' + captcha_type = fields.Selection([ + ('none','Disabled'), + ('google', 'Google Recaptcha'), + ],'Captcha type or disabled',required=True,default='google') + diff --git a/easy_my_coop_website/views/res_company_view.xml b/easy_my_coop_website/views/res_company_view.xml new file mode 100644 index 0000000..8dbce1b --- /dev/null +++ b/easy_my_coop_website/views/res_company_view.xml @@ -0,0 +1,14 @@ + + + + res.company.form.captcha.easymy.coop + + res.company + + + + + + + + diff --git a/easy_my_coop_website/views/subscription_template.xml b/easy_my_coop_website/views/subscription_template.xml index daf4079..73d01a7 100644 --- a/easy_my_coop_website/views/subscription_template.xml +++ b/easy_my_coop_website/views/subscription_template.xml @@ -474,7 +474,7 @@

@@ -973,6 +973,7 @@