From b973e27da55592caaff268964baa5d162dd7867f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 5 Jun 2014 12:22:37 +0200 Subject: [PATCH 1/2] [IMP] views: don't prevent always -> disabled writes in views, is confusing and not very useful --- openerp/addons/base/ir/ir_ui_view.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index aab5044d5b7..f3b6dab9063 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -268,14 +268,6 @@ class view(osv.osv): if custom_view_ids: self.pool.get('ir.ui.view.custom').unlink(cr, uid, custom_view_ids) - if vals.get('application') == 'disabled': - from_always = self.search( - cr, uid, [('id', 'in', ids), ('application', '=', 'always')], context=context) - if from_always: - raise ValueError( - "Can't disable views %s marked as always applied" % ( - ', '.join(map(str, from_always)))) - self.read_template.clear_cache(self) ret = super(view, self).write( cr, uid, ids, From e5560a2785c8f85b2c94c8f5c0fe15a0cd8f9b86 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 5 Jun 2014 16:08:42 +0200 Subject: [PATCH 2/2] [REM] test for removed 'feature' of refusing always -> disabled writes on views --- openerp/addons/base/tests/test_views.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py index 9167b65a70f..b8563a5e7e5 100644 --- a/openerp/addons/base/tests/test_views.py +++ b/openerp/addons/base/tests/test_views.py @@ -1161,10 +1161,6 @@ class TestOptionalViews(ViewCase): ) ) - def test_mandatory_no_disabled(self): - with self.assertRaises(Exception): - self.browse(self.v1).write({'application': 'disabled'}) - class TestXPathExtentions(common.BaseCase): def test_hasclass(self): tree = E.node(