Unifield Web

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

  1. US-2645
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4993
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-2645
Merge into: lp:unifield-web
Diff against target: 26 lines (+4/-1)
2 files modified
addons/openerp/widgets/form/_o2m.py (+3/-0)
addons/openerp/widgets/templates/listgrid/listgrid.mako (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-2645
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+385478@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/widgets/form/_o2m.py'
2--- addons/openerp/widgets/form/_o2m.py 2020-02-10 17:05:00 +0000
3+++ addons/openerp/widgets/form/_o2m.py 2020-06-10 07:55:50 +0000
4@@ -212,6 +212,9 @@
5 else:
6 sort_key_order = False
7
8+ if current.context and not current.context.get('lang') and rpc.session.context and rpc.session.context.get('lang'):
9+ current.context['lang'] = rpc.session.context['lang']
10+
11 ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, sort_key_order, current.context)
12 id = ids[0] if ids else None
13 current.id = id
14
15=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
16--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2020-04-30 15:59:44 +0000
17+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2020-06-10 07:55:50 +0000
18@@ -361,7 +361,7 @@
19 <th class="grid-cell"><div style="width: 0;"></div></th>
20 % endif
21 % elif field_attrs.get('displayon') != 'editable':
22- % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) or field_attrs.get('not_sortable'):
23+ % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) and not field_attrs.get('sort_column') or field_attrs.get('not_sortable'):
24 <th id="grid-data-column/${(name != '_terp_list' or None) and (name + '/')}${field}" class="grid-cell ${field_attrs.get('type', 'char')}" kind="${field_attrs.get('type', 'char')}">${field_attrs['string']|br}</th>
25 % else:
26 <th id="grid-data-column/${(name != '_terp_list' or None) and (name + '/')}${field}" class="grid-cell ${field_attrs.get('type', 'char')}" kind="${field_attrs.get('type', 'char')}" style="cursor: pointer;" onclick="new ListView('${name}').sort_by_order('${field}', this)"

Subscribers

People subscribed via source and target branches