Unifield Web

Merge lp:~dorian-kemps/unifield-web/US-10750 into lp:unifield-web

  1. US-10750
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5069
Proposed branch: lp:~dorian-kemps/unifield-web/US-10750
Merge into: lp:unifield-web
Diff against target: 38 lines (+4/-2)
3 files modified
addons/openerp/controllers/listgrid.py (+1/-1)
addons/openerp/static/javascript/form.js (+1/-1)
addons/openerp/widgets/screen.py (+2/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-web/US-10750
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+465694@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/listgrid.py'
2--- addons/openerp/controllers/listgrid.py 2024-02-28 12:44:01 +0000
3+++ addons/openerp/controllers/listgrid.py 2024-05-07 10:18:33 +0000
4@@ -148,7 +148,7 @@
5 view_id = ast.literal_eval(view_id) or False
6 ids = ast.literal_eval(ids) or []
7 view = cache.fields_view_get(model, view_id, view_type, rpc.session.context)
8- m2m_view = listgrid.List(name, model, view, ids,limit=20, editable=disabled!='true', m2m=1)
9+ m2m_view = listgrid.List(name, model, view, ids,limit=20, editable=disabled!='true', m2m=1, count=len(ids))
10 m2m_view = ustr(m2m_view.render())
11 return dict(m2m_view = m2m_view)
12
13
14=== modified file 'addons/openerp/static/javascript/form.js'
15--- addons/openerp/static/javascript/form.js 2024-02-05 15:49:33 +0000
16+++ addons/openerp/static/javascript/form.js 2024-05-07 10:18:33 +0000
17@@ -964,7 +964,7 @@
18 var fld_name = jQuery(fld).attr('name');
19 var old_m2m = jQuery(idSelector(fld_name)).closest('.list-a');
20 $(idSelector(fld_name+'/_terp_id')).val('');
21- $(idSelector(fld_name+'/_terp_ids')).val('[]');
22+ $(idSelector(fld_name+'/_terp_ids')).val(fld_val);
23 jQuery.ajax({
24 url: '/openerp/listgrid/get_m2m',
25 context: old_m2m,
26
27=== modified file 'addons/openerp/widgets/screen.py'
28--- addons/openerp/widgets/screen.py 2024-02-28 12:44:01 +0000
29+++ addons/openerp/widgets/screen.py 2024-05-07 10:18:33 +0000
30@@ -48,6 +48,8 @@
31 self.state = params.state or None
32 self.id = params.id or False
33 self.ids = params.ids
34+ if isinstance(self.ids, int): # To prevent len(int)
35+ self.ids = [self.ids]
36 self.view_ids = params.view_ids or []
37 self.view_mode = params.view_mode or []
38 self.view_type = params.view_type

Subscribers

People subscribed via source and target branches