Unifield Server

Merge lp:~unifield-team/unifield-server/utp-552 into lp:unifield-server

  1. utp-552
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3454
Proposed branch: lp:~unifield-team/unifield-server/utp-552
Merge into: lp:unifield-server
Diff against target: 26 lines (+3/-3)
1 file modified
bin/osv/orm.py (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/utp-552
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+157808@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/osv/orm.py'
2--- bin/osv/orm.py 2013-03-12 12:28:03 +0000
3+++ bin/osv/orm.py 2013-05-07 08:48:26 +0000
4@@ -2185,11 +2185,11 @@
5 continue
6
7 if order_column._classic_read:
8- getter = lambda d, i: d[1][order_field]
9+ getter = lambda d, i: len(d) > 1 and d[1].get(order_field) or False
10 elif order_column._type == 'many2one':
11 if sort_raw_id:
12 # uppon read, many2one sorting is done directly on 'id'
13- getter = lambda d, i: d[1][order_field]
14+ getter = lambda d, i: len(d) > 1 and d[1].get(order_field) or False
15 else:
16 # use the fact the read follow object standard _parent_order/_order to get many2one ordered
17 dest_model = self.pool.get(order_column._obj)
18@@ -2201,7 +2201,7 @@
19 if dest_ids_has_false:
20 ordered_ids.insert(0, False) # false is always first
21 order_info[order_field] = ordered_ids
22- getter = lambda d, i: i[order_field].index(d[1][order_field] or False)
23+ getter = lambda d, i: i.get(order_field) and len(d) > 1 and d[1].get(order_field) and i.get(order_field).index(d[1].get(order_field)) or False
24 else:
25 raise NotImplementedError()
26 order_parts_getters.append((getter, order_direction))

Subscribers

People subscribed via source and target branches

to all changes: