Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/us-999 into lp:unifield-web

  1. us-999
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4834
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/us-999
Merge into: lp:unifield-web
Diff against target: 24 lines (+3/-0)
2 files modified
addons/openerp/controllers/search.py (+2/-0)
addons/openerp/static/javascript/form.js (+1/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/us-999
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+316873@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/search.py'
2--- addons/openerp/controllers/search.py 2017-01-17 11:01:12 +0000
3+++ addons/openerp/controllers/search.py 2017-02-09 16:29:29 +0000
4@@ -163,6 +163,8 @@
5 search_domain=params.search_domain or [],
6 )
7
8+ if params.previous_active_id:
9+ ctx['previous_active_id'] = params.previous_active_id
10 if params.active_id and not params.active_ids:
11 ctx['active_ids'] = [params.active_id]
12
13
14=== modified file 'addons/openerp/static/javascript/form.js'
15--- addons/openerp/static/javascript/form.js 2017-01-02 14:59:00 +0000
16+++ addons/openerp/static/javascript/form.js 2017-02-09 16:29:29 +0000
17@@ -874,6 +874,7 @@
18 if (options.active_id) {
19 params['_terp_active_id'] = options.active_id;
20 params['_terp_active_ids'] = options.active_ids;
21+ params['_terp_previous_active_id'] = openobject.dom.get(prefix.concat('_terp_id').join('/')).value;
22 }
23
24 var parent_context = openobject.dom.get(prefix.concat('_terp_context').join('/'));

Subscribers

People subscribed via source and target branches