Merge lp:~unifield-team/unifield-wm/object-query-search-function-fix into lp:unifield-wm

Proposed by Vincent GREINER
Status: Needs review
Proposed branch: lp:~unifield-team/unifield-wm/object-query-search-function-fix
Merge into: lp:unifield-wm
Diff against target: 19 lines (+5/-4)
1 file modified
object_query/query.py (+5/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/object-query-search-function-fix
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+193889@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

1830. By Vincent GREINER

object-query-search-function-fix [FIX] let me fix when clicking on Search fields/add or Group by fields/add

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'object_query/query.py'
2--- object_query/query.py 2013-01-10 12:36:00 +0000
3+++ object_query/query.py 2013-11-05 09:05:56 +0000
4@@ -510,10 +510,11 @@
5 model_obj = self.pool.get(obj.model)
6 for field in obj.field_id:
7 all_fields_ids.append(field.id)
8- col = model_obj._columns[field.name]
9- if hasattr(col, '_properties') and col._properties and not col.store:
10- if a[0] == 'is_function' or not isinstance(col, fields.related):
11- field_ids.append(field.id)
12+ if name in model_obj._columns:
13+ col = model_obj._columns[field.name]
14+ if hasattr(col, '_properties') and col._properties and not col.store:
15+ if a[0] == 'is_function' or not isinstance(col, fields.related):
16+ field_ids.append(field.id)
17
18 if (a[1] == '=' and a[2] == False) or (a[1] == '!=' and a[2] == True):
19 return [('id', 'not in', field_ids)]

Subscribers

People subscribed via source and target branches