From 2bf6eab6097fd999249ab353e617c5b618ff740e Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 2 Feb 2017 18:00:50 +0100
Subject: [PATCH] [FIX] website: fix sitemap for multi website if more than one
 page

Template "sitemap_index_xml":
    <loc><t t-esc="url_root"/>sitemap-<t t-esc="page"/>.xml</loc>
should be:
    <loc><t t-esc="url_root"/>sitemap-<t t-esc="website_id"/>-<t t-esc="page"/>.xml</loc>

The fix in python is not elegant but allow to fix without -u of website.
---
 addons/website/controllers/main.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 423e61493c2..45940ac4cc4 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -151,9 +151,12 @@ class Website(openerp.addons.web.controllers.main.Home):
                 # rename the -id-page.xml => -id.xml
                 ira.write(cr, uid, last, dict(url="/sitemap-%d.xml" % current_website.id, name="/sitemap-%d.xml" % current_website.id), context=context)
             else:
+                # TODO: in master/saas-15, move current_website_id in template directly
+                pages_with_website = map(lambda p: "%d-%d" % (current_website.id, p), range(1, pages + 1))
+
                 # Sitemaps must be split in several smaller files with a sitemap index
                 content = iuv.render(cr, uid, 'website.sitemap_index_xml', dict(
-                    pages=range(1, pages + 1),
+                    pages=pages_with_website,
                     url_root=request.httprequest.url_root,
                 ), context=context)
                 create_sitemap('/sitemap-%d.xml' % current_website.id, content)