diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-09 13:55:27 +0200 |
| commit | eeae2b80ea9e679a86ca7c8982e679b9ee9c9023 (patch) | |
| tree | fff56bc907eb6874dc7a9b78382bd9837441b918 /addons/website/models | |
| parent | 7b67a1474b4f8df411804cebf8ebd7afa193d0dd (diff) | |
| parent | b793e23ae53b5f1edab8c98bbed7ac5f5f921280 (diff) | |
[MERGE] forward port branch 11.0 up to b793e23ae53
Diffstat (limited to 'addons/website/models')
| -rw-r--r-- | addons/website/models/website.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 1a18cae3ca6..0dbb1842235 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -885,9 +885,10 @@ class Menu(models.Model): for menu in data['data']: menu_id = self.browse(menu['id']) # if the url match a website.page, set the m2o relation - page = self.env['website.page'].search([('url', '=', menu['url'])], limit=1) + page = self.env['website.page'].search(['|', ('url', '=', menu['url']), ('url', '=', '/' + menu['url'])], limit=1) if page: menu['page_id'] = page.id + menu['url'] = page.url elif menu_id.page_id: menu_id.page_id.write({'url': menu['url']}) menu_id.write(menu) |