From 4c89edf2f892702363d31af03ee35e8669728ce8 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 30 Dec 2022 10:00:29 +0100 Subject: [PATCH 01/12] [ADD] survey_legal: New module 13.0 TT40980 --- survey_legal/README.rst | 95 ++++ survey_legal/__init__.py | 2 + survey_legal/__manifest__.py | 19 + survey_legal/controllers/__init__.py | 1 + survey_legal/controllers/main.py | 28 ++ survey_legal/i18n/survey_legal.pot | 47 ++ survey_legal/models/__init__.py | 2 + survey_legal/models/survey.py | 13 + survey_legal/models/survey_user_input.py | 12 + survey_legal/readme/CONFIGURE.rst | 7 + survey_legal/readme/CONTRIBUTORS.rst | 3 + survey_legal/readme/DESCRIPTION.rst | 2 + survey_legal/static/description/icon.png | Bin 0 -> 9142 bytes survey_legal/static/description/index.html | 436 ++++++++++++++++++ survey_legal/views/survey_templates.xml | 41 ++ .../views/survey_user_input_views.xml | 17 + survey_legal/views/survey_views.xml | 12 + 17 files changed, 737 insertions(+) create mode 100644 survey_legal/README.rst create mode 100644 survey_legal/__init__.py create mode 100644 survey_legal/__manifest__.py create mode 100644 survey_legal/controllers/__init__.py create mode 100644 survey_legal/controllers/main.py create mode 100644 survey_legal/i18n/survey_legal.pot create mode 100644 survey_legal/models/__init__.py create mode 100644 survey_legal/models/survey.py create mode 100644 survey_legal/models/survey_user_input.py create mode 100644 survey_legal/readme/CONFIGURE.rst create mode 100644 survey_legal/readme/CONTRIBUTORS.rst create mode 100644 survey_legal/readme/DESCRIPTION.rst create mode 100644 survey_legal/static/description/icon.png create mode 100644 survey_legal/static/description/index.html create mode 100644 survey_legal/views/survey_templates.xml create mode 100644 survey_legal/views/survey_user_input_views.xml create mode 100644 survey_legal/views/survey_views.xml diff --git a/survey_legal/README.rst b/survey_legal/README.rst new file mode 100644 index 00000000..a5d3a2ba --- /dev/null +++ b/survey_legal/README.rst @@ -0,0 +1,95 @@ +================== +Survey legal terms +================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github + :target: https://github.com/OCA/survey/tree/13.0/survey_legal + :alt: OCA/survey +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/survey-13-0/survey-13-0-survey_legal + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/200/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows you to include a legal terms acceptance checkbox in your surveys. You +have the ability to customize this feature for each individual survey. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To require legal terms acceptance in a survey, follow these steps: + +#. Go to to *Surveys* and select the survey you want to edit. +#. Go to the *Options* tab and check the *Requier legal terms acceptance* checkbox. + +The users of the survey will be required to accept the legal terms before they can +submit their answers to the questions. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_ + + * David Vidal + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-chienandalu| image:: https://github.com/chienandalu.png?size=40px + :target: https://github.com/chienandalu + :alt: chienandalu + +Current `maintainer `__: + +|maintainer-chienandalu| + +This module is part of the `OCA/survey `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/survey_legal/__init__.py b/survey_legal/__init__.py new file mode 100644 index 00000000..91c5580f --- /dev/null +++ b/survey_legal/__init__.py @@ -0,0 +1,2 @@ +from . import controllers +from . import models diff --git a/survey_legal/__manifest__.py b/survey_legal/__manifest__.py new file mode 100644 index 00000000..2c25589c --- /dev/null +++ b/survey_legal/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2022 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Survey legal terms", + "summary": "Require legal terms before survey submit", + "version": "13.0.1.0.0", + "development_status": "Beta", + "category": "Marketing/Survey", + "website": "https://github.com/OCA/survey", + "author": "Tecnativa, Odoo Community Association (OCA)", + "maintainers": ["chienandalu"], + "license": "AGPL-3", + "depends": ["survey", "website_legal_page"], + "data": [ + "views/survey_views.xml", + "views/survey_templates.xml", + "views/survey_user_input_views.xml", + ], +} diff --git a/survey_legal/controllers/__init__.py b/survey_legal/controllers/__init__.py new file mode 100644 index 00000000..12a7e529 --- /dev/null +++ b/survey_legal/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/survey_legal/controllers/main.py b/survey_legal/controllers/main.py new file mode 100644 index 00000000..cc289bf4 --- /dev/null +++ b/survey_legal/controllers/main.py @@ -0,0 +1,28 @@ +# Copyright 2023 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.http import request, route + +from odoo.addons.survey.controllers.main import Survey + + +class SurveyMetada(Survey): + @route() + def survey_submit(self, survey_token, answer_token, **post): + """The acceptance of the legal terms has the user's footprint warranty""" + res = super().survey_submit(survey_token, answer_token, **post) + access_data = self._get_access_data( + survey_token, answer_token, ensure_token=True + ) + if access_data["validity_code"] != "answer_done": + return res + answer_sudo = access_data["answer_sudo"] + if not answer_sudo.survey_id.legal_terms: + return res + environ = request.httprequest.headers.environ + answer_sudo.user_metadata = ( + f"IP: {environ.get('REMOTE_ADDR')}\n" + f"USER_AGENT: {environ.get('HTTP_USER_AGENT')}\n" + f"ACCEPT_LANGUAGE: {environ.get('HTTP_ACCEPT_LANGUAGE')}\n" + f"REFERER: {environ.get('HTTP_REFERER')}\n" + ) + return res diff --git a/survey_legal/i18n/survey_legal.pot b/survey_legal/i18n/survey_legal.pot new file mode 100644 index 00000000..50dd647e --- /dev/null +++ b/survey_legal/i18n/survey_legal.pot @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * survey_legal +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: survey_legal +#: model:ir.model.fields,help:survey_legal.field_survey_user_input__user_metadata +msgid "" +"Metadata gathered during survey validation when legal terms are enabled" +msgstr "" + +#. module: survey_legal +#: model:ir.model.fields,field_description:survey_legal.field_survey_survey__legal_terms +msgid "Require legal terms acceptance" +msgstr "" + +#. module: survey_legal +#: model:ir.model,name:survey_legal.model_survey_survey +msgid "Survey" +msgstr "" + +#. module: survey_legal +#: model:ir.model,name:survey_legal.model_survey_user_input +msgid "Survey User Input" +msgstr "" + +#. module: survey_legal +#: model:ir.model.fields,help:survey_legal.field_survey_survey__legal_terms +msgid "" +"The users will be prompted to require the acceptance of the legal terms to " +"be able to submit their answers" +msgstr "" + +#. module: survey_legal +#: model:ir.model.fields,field_description:survey_legal.field_survey_user_input__user_metadata +msgid "User Metadata" +msgstr "" diff --git a/survey_legal/models/__init__.py b/survey_legal/models/__init__.py new file mode 100644 index 00000000..843a39d6 --- /dev/null +++ b/survey_legal/models/__init__.py @@ -0,0 +1,2 @@ +from . import survey +from . import survey_user_input diff --git a/survey_legal/models/survey.py b/survey_legal/models/survey.py new file mode 100644 index 00000000..9db64c0a --- /dev/null +++ b/survey_legal/models/survey.py @@ -0,0 +1,13 @@ +# Copyright 2022 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class SurveySurvey(models.Model): + _inherit = "survey.survey" + + legal_terms = fields.Boolean( + string="Require legal terms acceptance", + help="The users will be prompted to require the acceptance of the legal terms " + "to be able to submit their answers", + ) diff --git a/survey_legal/models/survey_user_input.py b/survey_legal/models/survey_user_input.py new file mode 100644 index 00000000..1037278d --- /dev/null +++ b/survey_legal/models/survey_user_input.py @@ -0,0 +1,12 @@ +# Copyright 2023 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class SurveyUserInput(models.Model): + _inherit = "survey.user_input" + + user_metadata = fields.Text( + help="Metadata gathered during survey validation when legal terms are enabled", + readonly=True, + ) diff --git a/survey_legal/readme/CONFIGURE.rst b/survey_legal/readme/CONFIGURE.rst new file mode 100644 index 00000000..2bfb4a9e --- /dev/null +++ b/survey_legal/readme/CONFIGURE.rst @@ -0,0 +1,7 @@ +To require legal terms acceptance in a survey, follow these steps: + +#. Go to to *Surveys* and select the survey you want to edit. +#. Go to the *Options* tab and check the *Requier legal terms acceptance* checkbox. + +The users of the survey will be required to accept the legal terms before they can +submit their answers to the questions. diff --git a/survey_legal/readme/CONTRIBUTORS.rst b/survey_legal/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..fedc8467 --- /dev/null +++ b/survey_legal/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_ + + * David Vidal diff --git a/survey_legal/readme/DESCRIPTION.rst b/survey_legal/readme/DESCRIPTION.rst new file mode 100644 index 00000000..0099a76f --- /dev/null +++ b/survey_legal/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows you to include a legal terms acceptance checkbox in your surveys. You +have the ability to customize this feature for each individual survey. diff --git a/survey_legal/static/description/icon.png b/survey_legal/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3f200e502252bc7617b5f27380e230d841aae7d9 GIT binary patch literal 9142 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.Zsw?aT8J#>tc>@q-hdnz@*z?Y+k8cKW=R6**gi6QzWoNvg%wn zRT8gFR8RA1%z$F2%EwbFWUx2|6q*etX57trHcgk_K<%K35o33ngi|xUruRK@+e(xq zaa2QEW?^9pBLMKmX^4QaoTAC#Jw;~I)X#lSI^&U1K1zaCf`!+HV|}0HJrOW8;;>8S zS_UAas-lN^Xn`<3+d(f-YXD}IuiFjKqjys103l`-Xpjh{p0I50H@`~awMiIf5*4tF zKrt$B$B}Dfpy-tWH7$hIt0Kr3!P2vLa>&4qbfB%ME|r%wXZ5#?zW@LOWJyFpR9?r( z^I>WMKvn?YoJ|zA`n0N+#|zXlu{%nD?!6Lq%)+8NoC21iO5!zsBZK@5VzoTU z9hVqJi4-dvvrG`z5T`LdkxO!&6Co*hLMAJ-u)ar&$IyOH0-PQ&3QDkQlUOZp%6K}) zv1*f8El)OnS-dzUSXcqz1cMkE%c5KTXR%t|v>y=y7!PLd z(JK*>g9kM$XS`ju2hAqo^`;CN##BI7Z4ySH7|l?MKSlg?O&PB|#xH^e!~L=vGMnK} z0Em^*M1%T)+3f;xand2kmN(p-m0Ws zd!PD*V9J!HMluJ=w{5w02C zbU}>IJ*`tlqtL<0DmRz8=JBkXa-(6yr$FEs1$}+-6ew{JaYI?+>|n zV*4!Qh~!aYnjZIh-O=qj_@Gg&;!=m&wn-RO9gEwl#=RY@)cmRrUFROX8dKveEHj?YN zwhITYbsHbV2DAH>{UX_Xbj_-nuoU@PZLiWKiHdfWHA{(}HhIE2@vxI&-E@w} z>mFED6-e{@170-+@*&9bHW0=E3Ac){HIdR}qLHcj9*qHc;w&Oq&hkJ6O=Cac2uO4~ek9hzPx|8t#0TW2+1M3*8*Z=?k07*qoM6N<$f_X9? ArT_o{ literal 0 HcmV?d00001 diff --git a/survey_legal/static/description/index.html b/survey_legal/static/description/index.html new file mode 100644 index 00000000..7697ac74 --- /dev/null +++ b/survey_legal/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Survey legal terms + + + + + + diff --git a/survey_legal/views/survey_templates.xml b/survey_legal/views/survey_templates.xml new file mode 100644 index 00000000..8dc063e5 --- /dev/null +++ b/survey_legal/views/survey_templates.xml @@ -0,0 +1,41 @@ + + + + + diff --git a/survey_legal/views/survey_user_input_views.xml b/survey_legal/views/survey_user_input_views.xml new file mode 100644 index 00000000..caa8d43a --- /dev/null +++ b/survey_legal/views/survey_user_input_views.xml @@ -0,0 +1,17 @@ + + + + survey.user_input + + + + + + + + + + diff --git a/survey_legal/views/survey_views.xml b/survey_legal/views/survey_views.xml new file mode 100644 index 00000000..26a147a7 --- /dev/null +++ b/survey_legal/views/survey_views.xml @@ -0,0 +1,12 @@ + + + + survey.survey + + + + + + + + From 3d12c2217b6a20db0455afee8c83c4c92b7ec35f Mon Sep 17 00:00:00 2001 From: David Date: Tue, 22 Aug 2023 09:42:33 +0200 Subject: [PATCH 02/12] [MIG] survey_legal: Migration to 15.0 Aside from migration adaptations: - Drop website_require_legal dependency - Validation is now performed in js insead of the view so we need to do so. - Additional control for the legal terms link and text TT44775 --- survey_legal/README.rst | 11 +++--- survey_legal/__manifest__.py | 5 +-- survey_legal/controllers/main.py | 2 +- survey_legal/i18n/survey_legal.pot | 19 +++++++++- survey_legal/models/survey.py | 4 +++ survey_legal/readme/CONFIGURE.rst | 1 + survey_legal/static/description/index.html | 7 ++-- survey_legal/static/src/js/survey_form.esm.js | 31 ++++++++++++++++ survey_legal/views/survey_templates.xml | 35 ++++++++++++++----- survey_legal/views/survey_views.xml | 8 +++++ 10 files changed, 102 insertions(+), 21 deletions(-) create mode 100644 survey_legal/static/src/js/survey_form.esm.js diff --git a/survey_legal/README.rst b/survey_legal/README.rst index a5d3a2ba..5fe22647 100644 --- a/survey_legal/README.rst +++ b/survey_legal/README.rst @@ -14,13 +14,13 @@ Survey legal terms :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github - :target: https://github.com/OCA/survey/tree/13.0/survey_legal + :target: https://github.com/OCA/survey/tree/15.0/survey_legal :alt: OCA/survey .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/survey-13-0/survey-13-0-survey_legal + :target: https://translation.odoo-community.org/projects/survey-15-0/survey-15-0-survey_legal :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/200/13.0 + :target: https://runbot.odoo-community.org/runbot/200/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -40,6 +40,7 @@ To require legal terms acceptance in a survey, follow these steps: #. Go to to *Surveys* and select the survey you want to edit. #. Go to the *Options* tab and check the *Requier legal terms acceptance* checkbox. +#. Configure your desired legal terms link and text. The users of the survey will be required to accept the legal terms before they can submit their answers to the questions. @@ -50,7 +51,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -90,6 +91,6 @@ Current `maintainer `__: |maintainer-chienandalu| -This module is part of the `OCA/survey `_ project on GitHub. +This module is part of the `OCA/survey `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/survey_legal/__manifest__.py b/survey_legal/__manifest__.py index 2c25589c..6b4d67eb 100644 --- a/survey_legal/__manifest__.py +++ b/survey_legal/__manifest__.py @@ -3,17 +3,18 @@ { "name": "Survey legal terms", "summary": "Require legal terms before survey submit", - "version": "13.0.1.0.0", + "version": "15.0.1.0.0", "development_status": "Beta", "category": "Marketing/Survey", "website": "https://github.com/OCA/survey", "author": "Tecnativa, Odoo Community Association (OCA)", "maintainers": ["chienandalu"], "license": "AGPL-3", - "depends": ["survey", "website_legal_page"], + "depends": ["survey"], "data": [ "views/survey_views.xml", "views/survey_templates.xml", "views/survey_user_input_views.xml", ], + "assets": {"survey.survey_assets": ["survey_legal/static/src/js/*"]}, } diff --git a/survey_legal/controllers/main.py b/survey_legal/controllers/main.py index cc289bf4..593aae96 100644 --- a/survey_legal/controllers/main.py +++ b/survey_legal/controllers/main.py @@ -13,7 +13,7 @@ def survey_submit(self, survey_token, answer_token, **post): access_data = self._get_access_data( survey_token, answer_token, ensure_token=True ) - if access_data["validity_code"] != "answer_done": + if access_data["validity_code"] is not True: return res answer_sudo = access_data["answer_sudo"] if not answer_sudo.survey_id.legal_terms: diff --git a/survey_legal/i18n/survey_legal.pot b/survey_legal/i18n/survey_legal.pot index 50dd647e..6e68851a 100644 --- a/survey_legal/i18n/survey_legal.pot +++ b/survey_legal/i18n/survey_legal.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -13,6 +13,16 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: survey_legal +#: model:ir.model.fields,field_description:survey_legal.field_survey_survey__legal_terms_link +msgid "Legal Terms Link" +msgstr "" + +#. module: survey_legal +#: model:ir.model.fields,field_description:survey_legal.field_survey_survey__legal_terms_text +msgid "Legal Terms Text" +msgstr "" + #. module: survey_legal #: model:ir.model.fields,help:survey_legal.field_survey_user_input__user_metadata msgid "" @@ -45,3 +55,10 @@ msgstr "" #: model:ir.model.fields,field_description:survey_legal.field_survey_user_input__user_metadata msgid "User Metadata" msgstr "" + +#. module: survey_legal +#. openerp-web +#: code:addons/survey_legal/static/src/js/survey_form.esm.js:0 +#, python-format +msgid "You must accept the legal terms" +msgstr "" diff --git a/survey_legal/models/survey.py b/survey_legal/models/survey.py index 9db64c0a..69dc2f62 100644 --- a/survey_legal/models/survey.py +++ b/survey_legal/models/survey.py @@ -11,3 +11,7 @@ class SurveySurvey(models.Model): help="The users will be prompted to require the acceptance of the legal terms " "to be able to submit their answers", ) + legal_terms_link = fields.Char(default="/terms") + legal_terms_text = fields.Text( + default="I accept the legal terms, the privacy policy and conditions." + ) diff --git a/survey_legal/readme/CONFIGURE.rst b/survey_legal/readme/CONFIGURE.rst index 2bfb4a9e..fe920bf0 100644 --- a/survey_legal/readme/CONFIGURE.rst +++ b/survey_legal/readme/CONFIGURE.rst @@ -2,6 +2,7 @@ To require legal terms acceptance in a survey, follow these steps: #. Go to to *Surveys* and select the survey you want to edit. #. Go to the *Options* tab and check the *Requier legal terms acceptance* checkbox. +#. Configure your desired legal terms link and text. The users of the survey will be required to accept the legal terms before they can submit their answers to the questions. diff --git a/survey_legal/static/description/index.html b/survey_legal/static/description/index.html index 7697ac74..6e0df3f3 100644 --- a/survey_legal/static/description/index.html +++ b/survey_legal/static/description/index.html @@ -367,7 +367,7 @@

Survey legal terms

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/survey Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/survey Translate me on Weblate Try me on Runbot

This module allows you to include a legal terms acceptance checkbox in your surveys. You have the ability to customize this feature for each individual survey.

Table of contents

@@ -389,6 +389,7 @@

Configuration

  1. Go to to Surveys and select the survey you want to edit.
  2. Go to the Options tab and check the Requier legal terms acceptance checkbox.
    3. +
  3. Configure your desired legal terms link and text.

The users of the survey will be required to accept the legal terms before they can submit their answers to the questions.

@@ -398,7 +399,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -427,7 +428,7 @@

Maintainers

promote its widespread use.

Current maintainer:

chienandalu

-

This module is part of the OCA/survey project on GitHub.

+

This module is part of the OCA/survey project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/survey_legal/static/src/js/survey_form.esm.js b/survey_legal/static/src/js/survey_form.esm.js new file mode 100644 index 00000000..6369ca73 --- /dev/null +++ b/survey_legal/static/src/js/survey_form.esm.js @@ -0,0 +1,31 @@ +/** @odoo-module **/ +/* Copyright 2022 Tecnativa - David Vidal + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +*/ +import SurveyFormWidget from "survey.form"; +import {_t} from "web.core"; + +SurveyFormWidget.include({ + /** + * Validate legal terms acceptance if present + * + * @override + * @param {JQuery} [$form] the survey form + * @returns {Boolean} + */ + _validateForm: function ($form) { + const [$legalTermsInput] = $form.find("#accepted_legal_terms"); + const res = this._super(...arguments); + // The original method returns false when there are errors. We can break here + if (!res || !$legalTermsInput) { + return res; + } + if (!$legalTermsInput.checked) { + this._showErrors({ + accepted_legal_terms_wrapper: _t("You must accept the legal terms"), + }); + return false; + } + return res; + }, +}); diff --git a/survey_legal/views/survey_templates.xml b/survey_legal/views/survey_templates.xml index 8dc063e5..fe7bf0df 100644 --- a/survey_legal/views/survey_templates.xml +++ b/survey_legal/views/survey_templates.xml @@ -1,39 +1,56 @@ -