From 47b308d8ae2eff2c744e30ce986a9aa4d2d365a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 6 Mar 2019 15:35:01 +0000 Subject: [PATCH] [FIX] website_slides: correctly return deferred when calling slide routes in fullscreen I promise to fix all deferred. Huk huk huk. Commit linked to task ID 1941250 and PR #31584. --- addons/website_slides/controllers/main.py | 8 +++++--- .../static/src/js/slides_course_fullscreen_player.js | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index 087ed6919fa..5b915c582f3 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -559,11 +559,13 @@ class WebsiteSlides(WebsiteProfile): # SLIDE.SLIDE UTILS # -------------------------------------------------- - @http.route('/slide/html_content/get', type="json", auth="public", website=True) + @http.route('/slides/slide/get_html_content', type="json", auth="public", website=True) def get_html_content(self, slide_id): - slide = request.env['slide.slide'].browse(slide_id) + fetch_res = self._fetch_slide(slide_id) + if fetch_res.get('error'): + return fetch_res return { - 'html_content': slide.html_content + 'html_content': fetch_res['slide'].html_content } @http.route('/slides/slide//set_completed', website=True, type="http", auth="user") diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js index 12269298668..df8e57bf481 100644 --- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js +++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js @@ -201,7 +201,7 @@ odoo.define('website_slides.fullscreen', function (require) { */ _fetchQuiz: function (){ var self = this; - self._rpc({ + return self._rpc({ route:"/slide/quiz/get", params: { 'slide_id': self.slide.id @@ -215,8 +215,8 @@ odoo.define('website_slides.fullscreen', function (require) { }, _fetchHtmlContent: function (){ var self = this; - self._rpc({ - route:"/slide/html_content/get", + return self._rpc({ + route: 'slides/slide/get_html_content', params: { 'slide_id': self.slide.id } @@ -234,7 +234,7 @@ odoo.define('website_slides.fullscreen', function (require) { */ _setSlideStateAsDone: function (){ var self = this; - self._rpc({ + return self._rpc({ route: '/slides/slide/set_completed', params: { slide_id: self.slide.id,