From 49a005bbd1ecc85103005f63de2aa9bd28ebfe0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 19 Feb 2019 16:10:32 +0000 Subject: [PATCH] [FIX] website_slides: set slide as completed only for valid members MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Indeed some slides are available for external people if is_preview is set to True. It indicates slide is available for teasing. It should not be marked as completed for non members. This commit is linked to task ID 1942836 and PR #31239. Co-Authored-By: Aurélien Warnon Co-Authored-By: Thibault Delavallée --- addons/website_slides/controllers/main.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index cb7f66aaa58..50cea64c078 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -47,10 +47,15 @@ class WebsiteSlides(WebsiteProfile): slide.action_set_viewed() return True + def _set_completed_slide(self, slide): + if slide.website_published and slide.channel_id.is_member: + slide.action_set_completed() + return True + def _get_slide_detail(self, slide): most_viewed_slides = slide.get_most_viewed_slides(self._slides_per_list) related_slides = slide.get_related_slides(self._slides_per_list) - values = { + values = { 'slide': slide, 'most_viewed_slides': most_viewed_slides, 'related_slides': related_slides, @@ -477,20 +482,19 @@ class WebsiteSlides(WebsiteProfile): 'error': "You already passed this quiz" } - #SLIDE STATE CONTROLLERS + # SLIDE STATE CONTROLLERS + # TDE CLEANME: clean ctrlr / method name @http.route('/slide/completed/', website=True, type="http", auth="user") - def mark_as_completed(self, slide_id, next_slide=None, **kw): + def mark_as_completed(self, slide_id, next_slide=None): slide = request.env['slide.slide'].browse(slide_id) - slide.action_set_completed() + self._set_completed_slide(slide) return werkzeug.utils.redirect("/slides/slide/%s" %(next_slide)) - @http.route('/slides/set_completed', website=True, type="json", auth="user") - def set_status_as_done(self, slide_id, **kw): + def set_status_as_done(self, slide_id): slide = request.env['slide.slide'].browse(slide_id) - slide.channel_id.invalidate_cache() - slide.action_set_completed() + self._set_completed_slide(slide) return { 'channel_completion': slide.channel_id.completion }