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

ir.values: do return the search_view_id of action windows [Bug 681479] 

Partially revert cadc172a2cd09, that prevented both that field and
"search_view" from being read. While the latter one is expensive to
compute, the "search_view_id" is pretty harmless. GTK client (at least)
depends on that to select the appropriate search view.

bzr revid: p_christ@hol.gr-20101203164606-qdjfg0o7ybe0h2i1
This commit is contained in:
P. Christeas 2010-12-03 18:46:06 +02:00
parent dd0510428f
commit ee07fda232
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/addons/base/ir/ir_values.py
View File

@ -26,8 +26,7 @@ from tools.translate import _
EXCLUDED_FIELDS = set((
'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
'report_sxw_content_data', 'report_rml_content_data', 'search_view',
'search_view_id'))
'report_sxw_content_data', 'report_rml_content_data', 'search_view', ))
class ir_values(osv.osv):
_name = 'ir.values'
@ -205,6 +204,12 @@ class ir_values(osv.osv):
datas = datas and datas[0]
if not datas:
return False
if model == 'ir.actions.act_window' \
and 'search_view_id' in datas \
and datas['search_view_id']:
# GTK client has a bug, where it expects only the integer id
# rather than [id, name] (of many2one fields)
datas['search_view_id'] = datas['search_view_id'][0]
else:
datas = pickle.loads(x[2].encode('utf-8'))
if meta: