diff options
| -rw-r--r-- | addons/website/controllers/main.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_ui_view.py | 6 | ||||
| -rw-r--r-- | odoo/addons/base/tests/test_views.py | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 9cc42507c92..52d5f8e711f 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -301,7 +301,7 @@ class Website(Home): @http.route('/website/toggle_switchable_view', type='json', auth='user', website=True) def toggle_switchable_view(self, view_key): - request.website.viewref(view_key).toggle() + request.website.viewref(view_key).toggle_active() @http.route('/website/reset_template', type='http', auth='user', methods=['POST'], website=True, csrf=False) def reset_template(self, view_id, mode='soft', redirect='/', **kwargs): diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index 3ed1603efb2..15d98396d04 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -511,12 +511,6 @@ actual arch. default = dict(default or {}, key=new_key) return super(View, self).copy(default) - def toggle(self): - """ Switches between enabled and disabled statuses - """ - for view in self: - view.write({'active': not view.active}) - # default view selection @api.model def default_view(self, model, view_type): diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py index c3afcc7d39f..10370071f4d 100644 --- a/odoo/addons/base/tests/test_views.py +++ b/odoo/addons/base/tests/test_views.py @@ -2634,7 +2634,7 @@ class TestOptionalViews(ViewCase): """ Change active states of v2 and v3, check that the results are as expected """ - self.v2.toggle() + self.v2.toggle_active() context = {'check_view_ids': self.View.search([]).ids} arch = self.v0.with_context(context).read_combined(['arch'])['arch'] self.assertEqual( @@ -2645,7 +2645,7 @@ class TestOptionalViews(ViewCase): ) ) - self.v3.toggle() + self.v3.toggle_active() context = {'check_view_ids': self.View.search([]).ids} arch = self.v0.with_context(context).read_combined(['arch'])['arch'] self.assertEqual( @@ -2657,7 +2657,7 @@ class TestOptionalViews(ViewCase): ) ) - self.v2.toggle() + self.v2.toggle_active() context = {'check_view_ids': self.View.search([]).ids} arch = self.v0.with_context(context).read_combined(['arch'])['arch'] self.assertEqual( |