diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-09-12 16:33:48 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-09-13 10:35:42 +0200 |
| commit | c8a37b46788dbc345f39aff8fafb02b14e8537fe (patch) | |
| tree | 1e52b0bf0bc0afc60765f80ba48c6a1c2aa3763d /addons/website/controllers/main.py | |
| parent | f8dc09f0f22835dc44de1b0b09f6d6124808e320 (diff) | |
[FIX] website: adapt customize modal to multi-website
The code used the xml_id field instead of the key field at some point,
so the modal was not fetching the proper views.
This commit also removes the useless code in there.
Diffstat (limited to 'addons/website/controllers/main.py')
| -rw-r--r-- | addons/website/controllers/main.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 3018b62f1b4..90fcf0e68c1 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -354,26 +354,26 @@ class Website(Home): enable = [] disable = [] ids = self.get_view_ids(xml_ids) - for view in request.env['ir.ui.view'].with_context(active_test=True).browse(ids): + for view in request.env['ir.ui.view'].browse(ids): if view.active: - enable.append(view.xml_id) + enable.append(view.key) else: - disable.append(view.xml_id) + disable.append(view.key) return [enable, disable] @http.route(['/website/theme_customize'], type='json', auth="public", website=True) def theme_customize(self, enable, disable, get_bundle=False): """ enable or Disable lists of ``xml_id`` of the inherit templates """ - def set_active(ids, active): - if ids: - real_ids = self.get_view_ids(ids) - request.env['ir.ui.view'].with_context(active_test=True).browse(real_ids).write({'active': active}) + def set_active(xml_ids, active): + if xml_ids: + real_ids = self.get_view_ids(xml_ids) + request.env['ir.ui.view'].browse(real_ids).write({'active': active}) set_active(disable, False) set_active(enable, True) if get_bundle: - context = dict(request.context, active_test=True) + context = dict(request.context) return { 'web.assets_common': request.env["ir.qweb"]._get_asset('web.assets_common', options=context), 'web.assets_frontend': request.env["ir.qweb"]._get_asset('web.assets_frontend', options=context), |
