From 682342667eee6385306c85c85d1481eb8acfd326 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 15 Feb 2016 11:44:24 +0100
Subject: [PATCH] [FIX] website: confusing name and domain_name
To match the current website, we should compare the request http_host to the domain and not
to the website name. That was working luckily because name and domain in demo was the same.
close #10870
---
addons/website/data/demo.xml | 2 +-
addons/website/models/website.py | 7 ++-----
addons/website/views/website_views.xml | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml
index 57123baf35c3..c75c14dc4589 100644
--- a/addons/website/data/demo.xml
+++ b/addons/website/data/demo.xml
@@ -135,7 +135,7 @@ response = request.render("website.template_partner_comment", values)
</record>
<record id="website2" model="website">
- <field name="name">0.0.0.0</field>
+ <field name="name">Website 0.0.0.0</field>
<field name="domain">0.0.0.0</field>
<field name="social_twitter">https://twitter.com/Odoo</field>
<field name="social_facebook">https://www.facebook.com/Odoo</field>
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index a1427997ee12..5ab769741136 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -374,11 +374,8 @@ class website(osv.osv):
@openerp.tools.ormcache('domain_name')
def _get_current_website_id(self, cr, uid, domain_name, context=None):
- ids = self.search(cr, uid, [('name', '=', domain_name)], limit=1, context=context)
- if ids:
- return ids[0]
- else:
- return self.search(cr, uid, [], limit=1)[0]
+ ids = self.search(cr, uid, [('domain', '=', domain_name)], limit=1, context=context)
+ return ids and ids[0] or self.search(cr, uid, [], limit=1)[0]
def get_current_website(self, cr, uid, context=None):
domain_name = request.httprequest.environ.get('HTTP_HOST', '').split(':')[0]
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index dbcec2538915..284dac9eeb40 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -2,7 +2,7 @@
<openerp>
<data noupdate="1">
<record id="default_website" model="website">
- <field name="name">localhost</field>
+ <field name="name">Website localhost</field>
<field name="domain">localhost</field>
<field name="company_id" ref="base.main_company"/>
<field name="language_ids" eval="[(6, 0, [ ref('base.lang_en')])]"/>
--
GitLab