Unifield Web

Merge lp:~jfb-tempo-consulting/unifield-web/US-10874 into lp:unifield-web

  1. US-10874
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5054
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-10874
Merge into: lp:unifield-web
Diff against target: 31 lines (+6/-2)
2 files modified
addons/openerp/controllers/actions.py (+1/-1)
addons/openerp/static/javascript/openerp/openerp.base.js (+5/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-10874
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+445624@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/actions.py'
2--- addons/openerp/controllers/actions.py 2023-02-09 10:10:36 +0000
3+++ addons/openerp/controllers/actions.py 2023-06-29 07:06:50 +0000
4@@ -276,7 +276,7 @@
5 def refresh_o2m(action=False, *a, **b):
6 cherrypy.response.headers['Content-Type'] = 'text/javascript'
7 import json
8- return json.dumps({'reload': 1, 'list_grid': action.get('o2m_refresh')})
9+ return json.dumps({'reload': 1, 'list_grid': action.get('o2m_refresh'), 'reset_selection': action.get('reset_selection', 0)})
10
11 def act_window(action, data):
12 if not action.get('opened'):
13
14=== added file 'addons/openerp/static/images/link.png'
15Binary files addons/openerp/static/images/link.png and addons/openerp/static/images/link.png differ
16=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
17--- addons/openerp/static/javascript/openerp/openerp.base.js 2023-03-30 13:23:45 +0000
18+++ addons/openerp/static/javascript/openerp/openerp.base.js 2023-06-29 07:06:50 +0000
19@@ -159,7 +159,11 @@
20 }
21 if (parsed.reload) {
22 if (parsed.list_grid) {
23- new ListView(parsed.list_grid).reload();
24+ var lv = new ListView(parsed.list_grid)
25+ if (parsed.reset_selection) {
26+ lv.update_previously_selected([]);
27+ }
28+ lv.reload();
29 var o2mlist = openobject.dom.get('_o2m_' + parsed.list_grid);
30 if (o2mlist) {
31 onChange(o2mlist);

Subscribers

People subscribed via source and target branches