summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2014-12-01 16:38:39 +0100
committerMartin Trigaux <mat@odoo.com>2014-12-01 16:50:51 +0100
commitb3060f277101dc4d47d84a83693e2a5c73fbe44f (patch)
tree08426fd3a3097bd7a278ce28f4c0e04e2048f33c
parent02bdbee08875600ecd4001eaa011f2b9d1624fb7 (diff)
[FIX] website: can not change website name
The website name is by default "localhost" (used in the page title in the format "Current Page | Website Name") but there were no way to change it. Fixes #3493
-rw-r--r--addons/website/models/res_config.py3
-rw-r--r--addons/website/views/res_config.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index dd86f824602..1a85d66bd35 100644
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -7,6 +7,7 @@ class website_config_settings(osv.osv_memory):
_columns = {
'website_id': fields.many2one('website', string="website", required=True),
+ 'website_name': fields.related('website_id', 'name', type="char", string="Website Name"),
'language_ids': fields.related('website_id', 'language_ids', type='many2many', relation='res.lang', string='Languages'),
'default_lang_id': fields.related('website_id', 'default_lang_id', type='many2one', relation='res.lang', string='Default language'),
@@ -23,7 +24,7 @@ class website_config_settings(osv.osv_memory):
def on_change_website_id(self, cr, uid, ids, website_id, context=None):
website_data = self.pool.get('website').read(cr, uid, [website_id], [], context=context)[0]
- values = {}
+ values = {'website_name': website_data['name']}
for fname, v in website_data.items():
if fname in self._columns:
values[fname] = v[0] if v and self._columns[fname]._type == 'many2one' else v
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index b9b6810a070..5b2de475f7e 100644
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -15,6 +15,7 @@
<div>
<field name="website_id" invisible="True" on_change="on_change_website_id(website_id)"/>
<group string="Domain">
+ <field name="website_name" />
<label for="google_analytics_key"/>
<div name="google_analytics_key">
<div>