From 1c5371a966632eef2b6eaf67b755d13f529e7988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 21 Dec 2018 12:52:00 +0000
Subject: [PATCH] [IMP] survey: improve some survey pages

Survey has several side pages related to corner cases: closed surveys, void
surveys, ... those templates need a bit of polishing. Other main templates
are left untouched and will probably be improved in other tasks.

This commit is linked to task ID 1911586 and PR #28986.
---
 addons/survey/controllers/main.py        |  6 +++---
 addons/survey/views/survey_templates.xml | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index bf569e733e4..712edc23908 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -117,13 +117,13 @@ class Survey(http.Controller):
         answer_sudo = access_data['answer_sudo']
 
         if error_key == 'survey_void' and access_data['can_answer']:
-            return request.render("survey.nopages", {'survey': survey_sudo})
+            return request.render("survey.survey_void", {'survey': survey_sudo})
         elif error_key == 'survey_closed' and access_data['can_answer']:
-            return request.render("survey.notopen")
+            return request.render("survey.survey_expired", {'survey': survey_sudo})
         elif error_key == 'survey_auth' and answer_sudo.token:
             return request.render("survey.auth_required", {'survey': survey_sudo, 'token': answer_sudo.token})
         elif error_key == 'answer_deadline' and answer_sudo.token:
-            return request.render("survey.notopen")
+            return request.render("survey.survey_expired", {'survey': survey_sudo})
 
         return werkzeug.utils.redirect("/")
 
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 530bcdeffc3..4bcd81ba462 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -34,13 +34,13 @@
     </template>
 
     <!-- Message when the survey is not open  -->
-    <template id="notopen" name="Survey not open">
+    <template id="survey_expired" name="Survey Expired">
         <t t-call="survey.layout">
             <div class="wrap">
                 <div class="container">
                     <div class="jumbotron mt32">
-                        <h1>Not open</h1>
-                        <p>This survey is not open. Thank you for your interest!</p>
+                        <h1><span t-field="survey.title"/> survey expired</h1>
+                        <p>This survey is now closed. Thank you for your interest !</p>
                     </div>
                 </div>
             </div>
@@ -64,14 +64,18 @@
     </template>
 
     <!-- Message when the survey has no pages  -->
-    <template id="nopages" name="Survey has no pages">
+    <template id="survey_void" name="Survey has no pages">
         <t t-call="survey.layout">
             <div class="wrap">
                 <div class="container">
                     <t t-call="survey.back" />
                     <div class="jumbotron mt32">
-                        <h1>Not ready</h1>
-                        <p>This survey has no pages by now!</p>
+                        <h1><span t-field="survey.title"/> survey is void</h1>
+                        <p>This survey has no question defined currently.<br />
+                            <a t-att-href="'/web#view_type=form&amp;model=survey.survey&amp;id=%s&amp;action=survey.action_survey_form' % survey.id"
+                                class="btn btn-secondary"
+                                groups="survey.group_survey_manager">Edit in backend</a>
+                        </p>
                     </div>
                 </div>
             </div>