diff options
| -rw-r--r-- | addons/website_blog/models/website_blog.py | 3 | ||||
| -rw-r--r-- | addons/website_blog/tests/test_performance.py | 10 | ||||
| -rw-r--r-- | addons/website_blog/views/website_blog_components.xml | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 42ceb7074b0..c99d2c0b1d0 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -134,6 +134,8 @@ class BlogPost(models.Model): name = fields.Char('Title', required=True, translate=True, default='') subtitle = fields.Char('Sub Title', translate=True) author_id = fields.Many2one('res.partner', 'Author', default=lambda self: self.env.user.partner_id) + author_avatar = fields.Binary(related='author_id.image_128', string="Avatar", readonly=False) + author_name = fields.Char(related='author_id.display_name', string="Author Name", readonly=False, store=True) active = fields.Boolean('Active', default=True) blog_id = fields.Many2one('blog.blog', 'Blog', required=True, ondelete='cascade') tag_ids = fields.Many2many('blog.tag', string='Tags') @@ -151,7 +153,6 @@ class BlogPost(models.Model): create_uid = fields.Many2one('res.users', 'Created by', index=True, readonly=True) write_date = fields.Datetime('Last Updated on', index=True, readonly=True) write_uid = fields.Many2one('res.users', 'Last Contributor', index=True, readonly=True) - author_avatar = fields.Binary(related='author_id.image_128', string="Avatar", readonly=False) visits = fields.Integer('No of Views', copy=False, default=0) website_id = fields.Many2one(related='blog_id.website_id', readonly=True, store=True) diff --git a/addons/website_blog/tests/test_performance.py b/addons/website_blog/tests/test_performance.py index 1f2f64eb50a..cd50f9d2041 100644 --- a/addons/website_blog/tests/test_performance.py +++ b/addons/website_blog/tests/test_performance.py @@ -7,7 +7,7 @@ import random class TestBlogPerformance(UtilPerf): def test_10_perf_sql_blog_standard_data(self): - self.assertEqual(self._get_url_hot_query('/blog'), 29) + self.assertEqual(self._get_url_hot_query('/blog'), 26) def test_20_perf_sql_blog_bigger_data_scaling(self): BlogPost = self.env['blog.post'] @@ -19,8 +19,8 @@ class TestBlogPerformance(UtilPerf): for blog_post in blog_posts: blog_post.tag_ids += blog_tags blog_tags = blog_tags[:-1] - self.assertEqual(self._get_url_hot_query('/blog'), 27) - self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 54) + self.assertEqual(self._get_url_hot_query('/blog'), 26) + self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 53) def test_30_perf_sql_blog_bigger_data_scaling(self): BlogPost = self.env['blog.post'] @@ -32,5 +32,5 @@ class TestBlogPerformance(UtilPerf): for blog_post in blog_posts: blog_post.write({'tag_ids': [[6, 0, random.choices(blog_tags.ids, k=random.randint(0, len(blog_tags)))]]}) - self.assertEqual(self._get_url_hot_query('/blog'), 27) - self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 54) + self.assertEqual(self._get_url_hot_query('/blog'), 26) + self.assertEqual(self._get_url_hot_query(blog_post[0].website_url), 53) diff --git a/addons/website_blog/views/website_blog_components.xml b/addons/website_blog/views/website_blog_components.xml index 8c1dbea99fe..afdfca50d8f 100644 --- a/addons/website_blog/views/website_blog_components.xml +++ b/addons/website_blog/views/website_blog_components.xml @@ -72,7 +72,8 @@ style="line-height:1" t-options='{"widget": "image", "class": "rounded-circle " + "o_wblog_author_avatar mr-1" if hide_date else "o_wblog_author_avatar_date mr-2"}' /> <div t-att-class="not hide_date and 'small font-weight-bold'" style="line-height:1"> - <span t-field="blog_post.author_id" t-options='{ "widget": "contact", "fields": ["name"]}'/> + <span t-if="editable" t-field="blog_post.author_id" t-options='{ "widget": "contact", "fields": ["name"]}'/> + <span t-else="" t-esc="blog_post.author_name"/> <small t-if="not hide_date" t-field="blog_post.post_date" t-options='{"format": "d MMMM, yyyy"}'/> </div> </div> |