pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 10.0 up to c7c68bab84

Browse Source
This commit is contained in:
Christophe Simonis
2019-09-02 17:54:34 +02:00
parent ca34ae4329 c7c68bab84
commit ff1f3c557e
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_blog/controllers/main.py
+3
View File
@@ -106,6 +106,9 @@ class WebsiteBlog(http.Controller):
# retrocompatibility to accept tag as slug
active_tag_ids = tag and map(int, [unslug(t)[1] for t in tag.split(',')]) or []
if active_tag_ids:
fixed_tag_slug = ",".join(map(slug, request.env['blog.tag'].browse(active_tag_ids)))
if fixed_tag_slug != tag:
return request.redirect(request.httprequest.full_path.replace("/tag/%s/" % tag, "/tag/%s/" % fixed_tag_slug, 1), 301)
domain += [('tag_ids', 'in', active_tag_ids)]
if blog:
domain += [('blog_id', '=', blog.id)]
addons/website_blog/views/website_blog_templates.xml
+5 -5
View File
@@ -161,7 +161,7 @@
<!-- To display tags //no options -->
<t t-foreach="blog_post.tag_ids" t-as="one_tag">
<a class="mr8" t-attf-href="#{blog_url(tag=one_tag.id, date_begin=False, date_end=False)}" t-esc="one_tag.name"/>
<a class="mr8" t-attf-href="#{blog_url(tag=slug(one_tag), date_begin=False, date_end=False)}" t-esc="one_tag.name"/>
</t>
<div class="o_sharing_links">
<a class="fa fa-twitter-square o_twitter"></a>
@@ -245,7 +245,7 @@
<p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
<span class="fa fa-tags"/>
<t t-foreach="blog_post.tag_ids" t-as="one_tag">
<a class="label label-primary mr8" t-attf-href="#{blog_url(tag=one_tag.id)}" t-esc="one_tag.name"/>
<a class="label label-primary mr8" t-attf-href="#{blog_url(tag=slug(one_tag))}" t-esc="one_tag.name"/>
</t>
</p>
<div t-if="'cover_full' in blog_post_cover_properties.get('resize_class', '')" id="blog_angle_down">
@@ -408,7 +408,7 @@
<ul class="nav nav-pills nav-stacked">
<t t-foreach="tags" t-as="nav_tag">
<li t-att-class="nav_tag.id in active_tag_ids and 'active' or None" style="display: inline-block;">
<a t-attf-href="#{blog_url(tag=tags_list(active_tag_ids, nav_tag.id))}">
<a t-att-rel="'nofollow' if active_tag_ids else None" t-attf-href="#{blog_url(tag=tags_list(active_tag_ids, nav_tag.id))}">
<span t-field="nav_tag.name"/>
</a>
</li>
@@ -433,12 +433,12 @@
<t t-foreach="nav_list[year]" t-as="months">
<t t-if="months['date_begin'] == date">
<li class="active">
<a t-ignore="True" t-attf-href="#{blog_url(date_begin=False, date_end=False)}"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
<a t-ignore="True" rel="nofollow" t-attf-href="#{blog_url(date_begin=False, date_end=False)}"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
</li>
</t>
<t t-else="1">
<li>
<a t-ignore="True" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
<a t-ignore="True" rel="nofollow" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}"><t t-esc="months['month']"/><span class="pull-right badge" t-esc="months['post_date_count']"/></a>
</li>
</t>
</t>
doc/reference/cmdline.rst
+6
View File
@@ -170,6 +170,12 @@ database
when creating new databases from the database-management screens, use the
specified `template database`_. Defaults to ``template1``.
.. option:: --pg_path </path/to/postgresql/binaries>
Path to the PostgreSQL binaries that are used by the database manager to
dump and restore databases. You have to specify this option only if these
binaries are located in a non-standard directory.
.. _reference/cmdline/server/internationalisation:
Internationalisation