From 0ff1933ba122206db3003552b74f3a532cd68c3c Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Mon, 26 Aug 2019 14:35:17 +0000 Subject: [PATCH] [FIX] website: restore sitemap lastmod and priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 54d30d5194 introduced `lastmod` and `priority` on sitemap locs. This was broken with 4ecbacaf5957 which introduced `website.page` model as it removed the `PageConverter`. Before website.page: 1. PageConverter returned records with `__lastmod` 2. `enumerate_pages` loop on converters would remove the prefixed `__` After website.page: 1. code to remove `__` was still there but the pages would be found and looped on after that code, making it useless. With this commit: 1. The code to remove the `__` is moved after searching the pages. Following #36090 Related to #35464 Signed-off-by: Jérémy Kersten (jke) --- addons/website/models/website.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 2d267a489dc..cbaf967fb42 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -517,9 +517,6 @@ class Website(models.Model): domain_part, url = rule.build(value, append_unknown=False) if not query_string or query_string.lower() in url.lower(): page = {'loc': url} - for key, val in value.items(): - if key.startswith('__'): - page[key[2:]] = val if url in ('/sitemap.xml',): continue if url in url_set: @@ -543,9 +540,9 @@ class Website(models.Model): for page in pages: record = {'loc': page['url'], 'id': page['id'], 'name': page['name']} if page.view_id and page.view_id.priority != 16: - record['__priority'] = min(round(page.view_id.priority / 32.0, 1), 1) + record['priority'] = min(round(page.view_id.priority / 32.0, 1), 1) if page['write_date']: - record['__lastmod'] = page['write_date'][:10] + record['lastmod'] = page['write_date'][:10] yield record @api.multi