odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] removed unused fields (user_ids) on act_window 

bzr revid: fp@tinyerp.com-20091224142504-i7ajdf41rasxntpg
This commit is contained in:
Fabien Pinckaers 2009-12-24 15:25:04 +01:00
parent 2c739db798
commit 49c1cc97f4
2 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/addons/base/ir/ir.xml
View File

@ -354,7 +354,6 @@
<field name="view_id"/>
</tree>
</field>
<field colspan="4" name="default_user_ids"/>
<field colspan="4" name="menus"/>
<field colspan="4" name="domain"/>
<field colspan="4" name="context"/>

11
bin/addons/base/ir/ir_actions.py
View File

@ -159,16 +159,6 @@ class act_window(osv.osv):
(_check_model, 'Invalid model name in the action definition.', ['res_model','src_model'])
]
def get_filters(self, cr, uid, model):
cr.execute('select id from ir_act_window a where a.id not in (select act_id from ir_act_window_user_rel) and a.res_model=\''+model+'\' and a.filter=\'1\';')
all_ids = cr.fetchall()
filter_ids = map(lambda x:x[0],all_ids)
act_ids = self.search(cr,uid,[('res_model','=',model),('filter','=',1),('default_user_ids','in',(','.join(map(str,[uid,])),))])
act_ids += filter_ids
act_ids = list(set(act_ids))
my_acts = self.read(cr, uid, act_ids, ['name', 'domain'])
return my_acts
def _views_get_fnc(self, cr, uid, ids, name, arg, context={}):
res={}
for act in self.browse(cr, uid, ids):
@ -246,7 +236,6 @@ class act_window(osv.osv):
'act_id', 'gid', 'Groups'),
'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
'filter': fields.boolean('Filter'),
'default_user_ids': fields.many2many('res.users', 'ir_act_window_user_rel', 'act_id', 'uid', 'Users'),
'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
'menus': fields.char('Menus', size=4096)
}