Merge lp:~openerp-dev/openobject-client/trunk-bug-833814-nch into lp:openobject-client

Proposed by Naresh(OpenERP)
Status: Merged
Merged at revision: 1944
Proposed branch: lp:~openerp-dev/openobject-client/trunk-bug-833814-nch
Merge into: lp:openobject-client
Diff against target: 15 lines (+3/-2)
1 file modified
bin/widget/model/field.py (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client/trunk-bug-833814-nch
Reviewer Review Type Date Requested Status
OpenERP sa GTK client R&D Pending
Review via email: mp+74722@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 'bin/widget/model/field.py'
2--- bin/widget/model/field.py 2011-07-11 07:08:52 +0000
3+++ bin/widget/model/field.py 2011-09-09 06:35:24 +0000
4@@ -72,8 +72,9 @@
5 def context_get(self, model, check_load=True, eval=True):
6 context = {}
7 context.update(self.parent.context)
8- exclude_ctx = ['set_editable','set_visible','form_view_ref', 'group_by']
9- # removing default keys,group_by,search_default of the parent context
10+ #The keys in exclude_ctx should be removed from the parent context
11+ exclude_ctx = ['set_editable','set_visible',
12+ 'form_view_ref', 'tree_view_ref', 'group_by']
13 context_own = context.copy()
14 for c in context.items():
15 if c[0].startswith('default_') or c[0] in exclude_ctx\