From d020dd89b581343e17d61a1297efb1eb6b54f1e2 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Thu, 13 Feb 2020 16:04:19 +0000 Subject: [PATCH] [FIX] website_blog: simplify call to s_latest_posts Common part of the domain is automatically appended by controller now. X-original-commit: 38058cc6642b36195329e03ca187bd7d4366914d --- addons/website_blog/controllers/main.py | 9 +++++++-- .../static/src/snippets/s_latest_posts/000.js | 5 +---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 78fa3eef28a..619938ce118 100644 --- a/addons/website_blog/controllers/main.py +++ b/addons/website_blog/controllers/main.py @@ -300,6 +300,11 @@ class WebsiteBlog(http.Controller): @http.route(['/blog/render_latest_posts'], type='json', auth='public', website=True) def render_latest_posts(self, template, domain, limit=None, order='published_date desc'): - domain = expression.AND([domain, request.website.website_domain()]) - posts = request.env['blog.post'].search(domain, limit=limit, order=order) + dom = expression.AND([ + [('website_published', '=', True), ('post_date', '<=', fields.Datetime.now())], + request.website.website_domain() + ]) + if domain: + dom = expression.AND([dom, domain]) + posts = request.env['blog.post'].search(dom, limit=limit, order=order) return request.website.viewref(template).render({'posts': posts}) diff --git a/addons/website_blog/static/src/snippets/s_latest_posts/000.js b/addons/website_blog/static/src/snippets/s_latest_posts/000.js index 182ca443702..3ef418c87fc 100644 --- a/addons/website_blog/static/src/snippets/s_latest_posts/000.js +++ b/addons/website_blog/static/src/snippets/s_latest_posts/000.js @@ -30,10 +30,7 @@ publicWidget.registry.js_get_posts = publicWidget.Widget.extend({ this.$target.empty(); // Compatibility with db that saved content inside by mistake this.$target.attr('contenteditable', 'False'); // Prevent user edition - var domain = [ - ['website_published', '=', true], - ['post_date', '<=', moment().utc().locale('en').format('YYYY-MM-DD HH:mm:ss')], - ]; + var domain = []; if (blogID) { domain.push(['blog_id', '=', blogID]); }