From 4f4bd2f0e9d4bced68cb23313ecbfba0c0c57b0c Mon Sep 17 00:00:00 2001 From: "ced@b2ck.com" Date: Sat, 22 Dec 2007 21:47:25 +0100 Subject: [PATCH] Remove view_mode and view_id from act_window --- trytond/ir/actions.py | 4 ---- trytond/tools/convert.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/trytond/ir/actions.py b/trytond/ir/actions.py index 3075a9a647..7addd5d189 100644 --- a/trytond/ir/actions.py +++ b/trytond/ir/actions.py @@ -95,15 +95,12 @@ class ActionsActWindow(OSV): _columns = { 'name': fields.char('Action Name', size=64, translate=True), 'type': fields.char('Action Type', size=32, required=True), - 'view_id': fields.many2one('ir.ui.view', 'View Ref.', - ondelete='cascade'), 'domain': fields.char('Domain Value', size=250), 'context': fields.char('Context Value', size=250), 'res_model': fields.char('Model', size=64), 'src_model': fields.char('Source model', size=64), 'view_type': fields.selection([('tree','Tree'), ('form','Form')], string='Type of view'), - 'view_mode': fields.char('Mode of view', size=250), 'usage': fields.char('Action Usage', size=32), 'view_ids': fields.one2many('ir.actions.act_window.view', 'act_window_id', 'Views'), @@ -117,7 +114,6 @@ class ActionsActWindow(OSV): _defaults = { 'type': lambda *a: 'ir.actions.act_window', 'view_type': lambda *a: 'form', - 'view_mode': lambda *a: 'tree,form', 'context': lambda *a: '{}', 'limit': lambda *a: 80, 'auto_refresh': lambda *a: 0, diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py index 8986930d52..f032f473f6 100644 --- a/trytond/tools/convert.py +++ b/trytond/tools/convert.py @@ -438,11 +438,11 @@ class XMLImport(object): values['icon'] = icons.get(a_type,'STOCK_NEW') if a_type == 'act_window': a_id = self.id_get(cursor, a_action) - cursor.execute('SELECT view_type, view_mode, ' \ + cursor.execute('SELECT view_type, ' \ 'name, view_id ' \ 'FROM ir_act_window ' \ 'WHERE id = %d', (int(a_id),)) - action_type, action_mode, action_name, view_id = \ + action_type, action_name, view_id = \ cursor.fetchone() if view_id: cursor.execute('SELECT type FROM ir_ui_view ' \