From a5f115d1fcaa5b6a20d6c3e355d582bdf1de4789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Warnon?= <awa@odoo.com>
Date: Wed, 27 Nov 2019 13:25:54 +0000
Subject: [PATCH] [FIX] survey: fix typo in survey templates and lint some code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From
"Their was an error during the validation of the survey."
To
"There was an error during the validation of the survey."

Some side code linting is also performed because my linter is screaming on
me.

Task ID 1919290
PR #41429

Co-Authored-By: Aurélien Warnon <awa@odoo.com>
Co-Authored-By: Thibault Delavallée <tde@odoo.com>
---
 addons/survey/models/survey_question.py  | 13 ++++++-------
 addons/survey/views/survey_templates.xml |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/survey/models/survey_question.py b/addons/survey/models/survey_question.py
index c0c9d6a4bef..81e3a14238c 100644
--- a/addons/survey/models/survey_question.py
+++ b/addons/survey/models/survey_question.py
@@ -151,8 +151,9 @@ class SurveyQuestion(models.Model):
                         next_page_index = page._index()
                         break
 
-                question.question_ids = question.survey_id.question_ids.filtered(lambda q:
-                    q._index() > question._index() and (not next_page_index or q._index() < next_page_index))
+                question.question_ids = question.survey_id.question_ids.filtered(
+                    lambda q: q._index() > question._index() and (not next_page_index or q._index() < next_page_index)
+                )
             else:
                 question.question_ids = self.env['survey.question']
 
@@ -164,11 +165,9 @@ class SurveyQuestion(models.Model):
                 question.page_id = None
             else:
                 question.page_id = next(
-                    (iter(question
-                        .survey_id
-                        .question_and_page_ids
-                        .filtered(lambda q: q.is_page and q.sequence < question.sequence)
-                        .sorted(reverse=True))),
+                    (iter(question.survey_id.question_and_page_ids.filtered(
+                        lambda q: q.is_page and q.sequence < question.sequence
+                    ).sorted(reverse=True))),
                     None
                 )
 
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 6242a477d78..88056d5372e 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -74,7 +74,7 @@
             <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
             <input type="hidden" name="token" t-att-value="answer.access_token" />
             <div class="o_survey_error alert alert-danger d-none" role="alert">
-                <p>Their was an error during the validation of the survey.</p>
+                <p>There was an error during the validation of the survey.</p>
             </div>
             <t t-if="survey.questions_layout == 'one_page'">
                 <t t-foreach='survey.question_and_page_ids' t-as='question'>