Unifield Web

Merge lp:~unifield-team/unifield-web/utp-580-582-697-web into lp:unifield-web

  1. utp-580-582-697-web
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4735
Proposed branch: lp:~unifield-team/unifield-web/utp-580-582-697-web
Merge into: lp:unifield-web
Diff against target: 23 lines (+4/-1)
1 file modified
addons/openerp/controllers/impex.py (+4/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/utp-580-582-697-web
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+210992@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/impex.py'
2--- addons/openerp/controllers/impex.py 2014-01-09 08:50:16 +0000
3+++ addons/openerp/controllers/impex.py 2014-03-14 08:53:18 +0000
4@@ -432,6 +432,8 @@
5 view_name = ctx.get('_terp_view_name', '')
6
7 if ctx.get('group_by_no_leaf'):
8+ ctx['client_export_data'] = True # UTP-580-582-697 client export flag
9+
10 rpc_obj = rpc.RPCProxy(params.model)
11 domain = params.search_domain or []
12 to_group = ctx.get('group_by', [])
13@@ -479,8 +481,9 @@
14 return self.export_html(params.fields2, result, view_name)
15 return export_csv(params.fields2, result)
16
17- if not params.ids or all_records:
18+ if not params.ids or all_records or ctx.get('group_by_no_leaf'):
19 domain = params.search_domain or []
20+ ctx.update({'domain': domain})
21 if params.model == 'product.product':
22 ids = proxy.search(domain, 0, None, 0, ctx)
23 else:

Subscribers

People subscribed via source and target branches

to all changes: