Merge lp:~openerp-dev/openobject-client-web/trunk-bug-714610-sma into lp:openobject-client-web/trunk

Proposed by Sananaz (Open ERP)
Status: Merged
Approved by: Xavier (Open ERP)
Approved revision: 4586
Merged at revision: 4588
Proposed branch: lp:~openerp-dev/openobject-client-web/trunk-bug-714610-sma
Merge into: lp:openobject-client-web/trunk
Diff against target: 25 lines (+6/-2)
1 file modified
addons/openerp/controllers/search.py (+6/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/trunk-bug-714610-sma
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+50142@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/search.py'
2--- addons/openerp/controllers/search.py 2011-02-10 16:09:23 +0000
3+++ addons/openerp/controllers/search.py 2011-02-17 12:59:55 +0000
4@@ -211,6 +211,8 @@
5 'value': val[field],
6 'type': res[field].get('type')
7 }
8+ if fld['type'] == 'many2many':
9+ fld['type'] = 'char'
10 datas = {field: fld}
11 frm_datas[field] = fld
12 try:
13@@ -285,9 +287,11 @@
14 else:
15 fieldname = field
16 bound = ''
17-
18+
19 data = {}
20- fld['type'] = res[fieldname].get('type')
21+ fld['type'] = res[fieldname].get('type')
22+ if fld['type'] == 'many2many':
23+ fld['type'] = 'char'
24 fld['value'] = value
25 data[field] = fld
26