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

[REF] website: rename website.redirect,type to redirect_type

Browse Source 
Part of odoo/odoo#27599 to rename fields named 'type' which may conflict

closes odoo/odoo#28112
This commit is contained in:
mreficent
2018-10-24 14:32:49 +00:00
committed by Martin Trigaux
parent b6c3ad1b8d
commit 2924b77b6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/models/website.py
+1 -1
View File
@@ -1210,7 +1210,7 @@ class WebsiteRedirect(models.Model):
_order = "sequence, id"
_rec_name = 'url_from'
type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True)
redirect_type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True, oldname='type')
url_from = fields.Char('Redirect From', required=True)
url_to = fields.Char('Redirect To', required=True)
website_id = fields.Many2one('website', 'Website')
addons/website/views/website_views.xml
+3 -3
View File
@@ -70,7 +70,7 @@
<field name="url_to"/>
<group string="Group By">
<filter string="Redirection Type" name="group_by_type" domain="[]" context="{'group_by': 'type'}"/>
<filter string="Redirection Type" name="group_by_type" domain="[]" context="{'group_by': 'redirect_type'}"/>
</group>
</search>
</field>
@@ -94,7 +94,7 @@
<sheet>
<group>
<group>
<field name="type"/>
<field name="redirect_type"/>
<field name="url_from"/>
<field name="url_to"/>
</group>
@@ -113,7 +113,7 @@
<field name="model">website.redirect</field>
<field name="arch" type="xml">
<tree string="Website Redirects" editable="bottom">
<field name="type"/>
<field name="redirect_type"/>
<field name="url_from"/>
<field name="url_to"/>
<field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>