diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql index b1ddb2eec70..757b5731f8b 100644 --- a/openerp/addons/base/base.sql +++ b/openerp/addons/base/base.sql @@ -113,18 +113,6 @@ CREATE TABLE ir_act_client ( ) INHERITS (ir_actions); - -CREATE TABLE ir_ui_view ( - id serial NOT NULL, - name varchar(64) DEFAULT ''::varchar NOT NULL, - model varchar(64) DEFAULT ''::varchar NOT NULL, - "type" varchar(64) DEFAULT 'form'::varchar NOT NULL, - arch text NOT NULL, - field_parent varchar(64), - priority integer DEFAULT 5 NOT NULL, - primary key(id) -); - CREATE TABLE ir_ui_menu ( id serial NOT NULL, parent_id int references ir_ui_menu on delete set null, @@ -410,4 +398,4 @@ insert into ir_model_data (name,module,model,noupdate,res_id) VALUES ('main_comp select setval('res_company_id_seq', 2); select setval('res_users_id_seq', 2); select setval('res_partner_id_seq', 2); -select setval('res_currency_id_seq', 2); \ No newline at end of file +select setval('res_currency_id_seq', 2); diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 79dbc3ff419..839bbc1406f 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -68,7 +68,7 @@ class view(osv.osv): _columns = { 'name': fields.char('View Name', required=True), - 'model': fields.char('Object', size=64, required=True, select=True), + 'model': fields.char('Object', size=64, select=True), 'priority': fields.integer('Sequence', required=True), 'type': fields.function(_type_field, type='selection', selection=[ ('tree','Tree'), @@ -79,7 +79,7 @@ class view(osv.osv): ('diagram','Diagram'), ('gantt', 'Gantt'), ('kanban', 'Kanban'), - ('search','Search')], string='View Type', required=True, select=True, store=True), + ('search','Search')], string='View Type', select=True, store=True), 'arch': fields.text('View Architecture', required=True), 'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True), 'field_parent': fields.char('Child Field',size=64), @@ -90,9 +90,7 @@ class view(osv.osv): 'model_ids': fields.one2many('ir.model.data', 'res_id', auto_join=True), } _defaults = { - 'arch': '\n\n\t\n', 'priority': 16, - 'type': 'tree', } _order = "priority,name" @@ -284,7 +282,7 @@ class view(osv.osv): """ user_groups = frozenset(self.pool.get('res.users').browse(cr, 1, uid, context).groups_id) - conditions = [['inherit_id', '=', view_id], ['model', '=', model or '']] + conditions = [['inherit_id', '=', view_id], ['model', '=', model]] if self.pool._init: # Module init currently in progress, only consider views from # modules whose code is already loaded diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py index d7f54140bfe..9006a86500b 100644 --- a/openerp/addons/base/tests/test_views.py +++ b/openerp/addons/base/tests/test_views.py @@ -239,7 +239,7 @@ class TestNoModel(common.TransactionCase): 'type': 'form', 'priority': 16, 'inherit_id': False, - 'model': '', + 'model': False, }) arch = E.body(