From c7f4f6d978a1bc94f5dc4424aef1b547409263e9 Mon Sep 17 00:00:00 2001 From: Priyanka Kakadiya Date: Fri, 9 Oct 2020 11:35:06 +0000 Subject: [PATCH] [IMP] website_slides_survey: share channel from result page This commit enables eLearning users to share the channel linked to certification they cleared directly from the result page. Notes: 1 - We already have the option to share a certificate from the user info page or from the slide page, and the same mechanism has been utilised here. 2 - With a recent commit[1], top padding was added to the modal opened on website front-end to prevent modal overlapping the navbar. But it caused a side effect on survey result page, where navbar is hidden. So we remove this top padding on modal for the survey result page. [1] - https://github.com/odoo/odoo/commit/6ef622772f7d0172553aca6dbce9eb71855460d7 taskId - 2337696 closes odoo/odoo#58104 Signed-off-by: Thibault Delavallee (tde) --- .../website_slides_survey/controllers/survey.py | 2 +- .../src/scss/website_slides_survey_result.scss | 15 +++++++++++++++ addons/website_slides_survey/views/assets.xml | 5 +++++ .../views/survey_templates.xml | 15 +++++++++++++-- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 addons/website_slides_survey/static/src/scss/website_slides_survey_result.scss diff --git a/addons/website_slides_survey/controllers/survey.py b/addons/website_slides_survey/controllers/survey.py index 718b890e2c0..8995e56cf10 100644 --- a/addons/website_slides_survey/controllers/survey.py +++ b/addons/website_slides_survey/controllers/survey.py @@ -8,7 +8,7 @@ class Survey(main.Survey): def _prepare_survey_finished_values(self, survey, answer, token=False): result = super(Survey, self)._prepare_survey_finished_values(survey, answer, token) if answer.slide_id: - result['channel_url'] = answer.slide_id.channel_id.website_url + result['channel_id'] = answer.slide_id.channel_id return result diff --git a/addons/website_slides_survey/static/src/scss/website_slides_survey_result.scss b/addons/website_slides_survey/static/src/scss/website_slides_survey_result.scss new file mode 100644 index 00000000000..c33d2428c43 --- /dev/null +++ b/addons/website_slides_survey/static/src/scss/website_slides_survey_result.scss @@ -0,0 +1,15 @@ +// Certification Share modal on survey result page + +/* +When website is installed, modal overlaps the navbar. And to fix that, +'top' css property has been utilized. As a side-effect, it shows white +stripe in some survey related pages (due to hidden navbar). + +So we simply set the 'top' to 0 to for avoiding it for those pages. Thankfully, +for such pages, there's a separate asset bundle where we include this file, and +so it won't affect the rest of the website pages. +*/ + +#wrapwrap .modal { + top: 0; +} diff --git a/addons/website_slides_survey/views/assets.xml b/addons/website_slides_survey/views/assets.xml index 5b8fd3a0530..203d840963e 100644 --- a/addons/website_slides_survey/views/assets.xml +++ b/addons/website_slides_survey/views/assets.xml @@ -11,5 +11,10 @@