[IMP] website_form, website_hr_recruitment: improve thankyou page

Improve thank page after the application to a job.
Stop duplicate Magic field, using global fields
Add helper method on website to retreive the last created record

4 files changed, 51 insertions, 17 deletions

diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py
index 2f5f7ec2292..8a8e1a43d6b 100644
--- a/addons/website_form/controllers/main.py
+++ b/addons/website_form/controllers/main.py
@@ -43,8 +43,9 @@ class WebsiteForm(http.Controller):
         except IntegrityError:
             return json.dumps(False)
 
+        request.session['form_builder_model_model'] = model_record.model
         request.session['form_builder_model'] = model_record.name
-        request.session['form_builder_id']    = id_record
+        request.session['form_builder_id'] = id_record
 
         return json.dumps({'id': id_record})
 
diff --git a/addons/website_form/models/models.py b/addons/website_form/models/models.py
index 7ac2c38d715..3c118176ec6 100644
--- a/addons/website_form/models/models.py
+++ b/addons/website_form/models/models.py
@@ -4,12 +4,18 @@
 import itertools
 
 from odoo import models, fields, api
+from odoo.http import request
 
-MAGIC_FIELDS = ["id", "create_uid", "create_date", "write_uid", "write_date", "__last_update"]
 
 class website_form_config(models.Model):
     _inherit = 'website'
-    website_form_enable_metadata = fields.Boolean('Write metadata',help="Enable writing metadata on form submit.")
+
+    website_form_enable_metadata = fields.Boolean('Write metadata', help="Enable writing metadata on form submit.")
+
+    def _website_form_last_record(self):
+        if request and request.session.form_builder_model_model:
+            return request.env[request.session.form_builder_model_model].browse(request.session.form_builder_id)
+        return False
 
 
 class website_form_model(models.Model):
@@ -52,7 +58,7 @@ class website_form_model(models.Model):
         fields_get = model.fields_get()
 
         for key, val in model._inherits.iteritems():
-            fields_get.pop(val,None)
+            fields_get.pop(val, None)
 
         # Unrequire fields with default values
         default_values = model.default_get(fields_get.keys())
@@ -60,6 +66,7 @@ class website_form_model(models.Model):
             fields_get[field]['required'] = False
 
         # Remove readonly and magic fields
+        MAGIC_FIELDS = models.MAGIC_COLUMNS + [model.CONCURRENCY_CHECK_FIELD]
         for field in fields_get.keys():
             if fields_get[field]['readonly'] or field in MAGIC_FIELDS:
                 del fields_get[field]
diff --git a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js
index aedbdca8445..6b34c373438 100644
--- a/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js
+++ b/addons/website_hr_recruitment/static/src/js/website_hr_recruitment_tour.js
@@ -29,7 +29,7 @@ odoo.define('website_hr_recruitment.tour', function(require) {
         trigger: ".o_website_form_send"
     }, {
         content: "Check the form is submited without errors",
-        trigger: ".oe_structure:has(h1:contains('Thank you!'))"
+        trigger: ".oe_structure:has(h1:contains('Congratulations'))"
     }]);
 
     return {};
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index b07f36d8ce7..914533a774c 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -380,21 +380,47 @@
         <div id="wrap">
             <div class="oe_structure">
                 <div class="container">
-                    <h1>Thank you!</h1>
-                    <p>
-                        Your job application has been successfully registered,
-                        we will get back to you soon.
-                    </p>
-                </div>
-                <section class="oe_dark">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 text-center mt16 mb16">
-                                <a href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <h1 class="text-center">Congratulations!</h1>
+                        </div>
+                        <t t-if="request.session.get('form_builder_model_model', '') == 'hr.applicant'">
+                            <t t-set="job" t-value="request.website._website_form_last_record().sudo().job_id"/>
+                            <t t-set="responsible" t-value="job and job.user_id.website_published and job.user_id "/>
+                        </t>
+                        <t t-if="responsible">
+                            <div class="col-md-12">
+                                <h3 class="mb32 text-center">Your application has been sent to:</h3>
+                            </div>
+                            <div class="col-md-1 col-md-offset-4">
+                                <p t-field="responsible.image_small" t-field-options="{'widget': 'image', 'class': 'img-circle center-block'}"/>
                             </div>
+                            <div class="col-md-5 o_responsible_data">
+                                <h4 class="mt0" t-field="responsible.name"/>
+                                <p t-field="responsible.function"/>
+                                <t t-if='responsible.email'>
+                                    <i class="fa fa-envelope"></i> <a t-attf-href="mailto:#{responsible.email}" t-esc="responsible.email"/>
+                                </t>
+                                <t t-if='responsible.phone'>
+                                    <br/><i class="fa fa-phone"></i> <span t-field="responsible.phone"/>
+                                </t>
+                            </div>
+                        </t>
+                        <div class="col-md-12 mt32 text-center">
+                            <span>
+                                We usually reply between one and three days.<br/>
+                                Feel free to contact him/her if you have further questions.
+                            </span>
                         </div>
                     </div>
-                </section>
+                    <div class="row">
+                        <div class="col-md-12 text-center mt32 mb32">
+                            <span>In the meantime</span>
+                            <h3 class="mt8 mb32">Look around on our website.</h3>
+                            <a href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </t>