diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-04-05 19:40:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-04-05 19:40:54 +0200 |
| commit | 91ea17af5ff03965989dfb0b46b36cbc950ad44d (patch) | |
| tree | 704d8c50e4e62d34157562b0c4d8a9a7c7578ec8 /addons | |
| parent | 82f45063c0e4e66eee9a96272d7583660ba07f4a (diff) | |
| parent | a93a5c6824e4ad917394299b6b30051ba7809eed (diff) | |
[MERGE] forward port branch 10.0 up to a93a5c6824e
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_blog/models/website_blog.py | 2 | ||||
| -rw-r--r-- | addons/website_blog/views/website_blog_templates.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 73fdd45a499..3c5f443b4f7 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -165,7 +165,7 @@ class BlogPost(models.Model): blog_post.teaser = blog_post.teaser_manual else: content = html2plaintext(blog_post.content).replace('\n', ' ') - blog_post.teaser = ' '.join(filter(None, content.split(' '))[:50]) + '...' + blog_post.teaser = content[:150] + '...' @api.multi def _set_teaser(self): diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index 49a5210624f..4a6d8517fab 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -101,6 +101,7 @@ <t t-call="website_blog.index"> <t t-set="head"> <link t-att-href="'/blog/%s/feed' % (blog.id)" type="application/atom+xml" rel="alternate" title="Atom Feed"/> + <meta t-if="len(active_tag_ids) > 0" name="robots" t-attf-content="#{len(active_tag_ids) > 1 and 'noindex,'} nofollow"/> </t> <div class="oe_structure"/> <div class="container"> |