Unifield Web

Merge lp:~unifield-team/unifield-web/uf_893_print_context into lp:unifield-web

  1. uf_893_print_context
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4632
Proposed branch: lp:~unifield-team/unifield-web/uf_893_print_context
Merge into: lp:unifield-web
Diff against target: 52 lines (+9/-4)
3 files modified
addons/openerp/controllers/form.py (+1/-1)
addons/openerp/controllers/search.py (+2/-1)
addons/openerp/static/javascript/form.js (+6/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf_893_print_context
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+99034@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/form.py'
2--- addons/openerp/controllers/form.py 2011-08-22 10:15:06 +0000
3+++ addons/openerp/controllers/form.py 2012-03-23 14:37:32 +0000
4@@ -997,7 +997,7 @@
5 if type is None:
6 action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], context)['type']
7 action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, context)
8-
9+ print "---------------------", domain, kw
10 if domain:
11 if isinstance(domain, basestring):
12 domain = eval(domain)
13
14=== modified file 'addons/openerp/controllers/search.py'
15--- addons/openerp/controllers/search.py 2011-12-29 09:43:09 +0000
16+++ addons/openerp/controllers/search.py 2012-03-23 14:37:32 +0000
17@@ -145,7 +145,8 @@
18 parent=pctx,
19 context=parent_context,
20 active_id=params.active_id or False,
21- active_ids=params.active_ids or []
22+ active_ids=params.active_ids or [],
23+ search_domain=params.search_domain or [],
24 )
25
26 if params.active_id and not params.active_ids:
27
28=== modified file 'addons/openerp/static/javascript/form.js'
29--- addons/openerp/static/javascript/form.js 2012-01-06 10:47:56 +0000
30+++ addons/openerp/static/javascript/form.js 2012-03-23 14:37:32 +0000
31@@ -768,7 +768,8 @@
32 '_terp_context': options.context,
33 '_terp_prefix': prefix.join('/'),
34 '_terp_active_id': openobject.dom.get(prefix.concat('_terp_id').join('/')).value,
35- '_terp_active_ids': openobject.dom.get(prefix.concat('_terp_ids').join('/')).value
36+ '_terp_active_ids': openobject.dom.get(prefix.concat('_terp_ids').join('/')).value,
37+ '_terp_search_domain': '[]'
38 });
39
40 if (options.group_by_ctx && options.group_by_ctx.length > 0)
41@@ -782,7 +783,10 @@
42 }
43
44 var parent_context = openobject.dom.get(prefix.concat('_terp_context').join('/'));
45-
46+ var search_domain = openobject.dom.get(prefix.concat('_terp_domain').join('/'));
47+ if (search_domain) {
48+ params['_terp_search_domain'] = search_domain.value;
49+ }
50 if (parent_context) {
51 params['_terp_parent_context'] = parent_context.value;
52 }

Subscribers

People subscribed via source and target branches

to all changes: