[FIX] website_blog: simplify call to s_latest_posts

Common part of the domain is automatically appended by controller now.

X-original-commit: 38058cc6642b36195329e03ca187bd7d4366914d
This commit is contained in:
Jeremy Kersten
2020-02-21 12:30:14 +00:00
parent 8b63f15e27
commit d020dd89b5
2 changed files with 8 additions and 6 deletions
+7 -2
View File
@@ -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})
@@ -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]);
}