Unifield Web

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

  1. US-4375
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-4375
Merge into: lp:unifield-web
Diff against target: 39 lines (+7/-3)
2 files modified
addons/openerp/controllers/impex.py (+1/-1)
addons/openerp/widgets/templates/listgrid/listgrid.mako (+6/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-4375
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+356387@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/impex.py'
2--- addons/openerp/controllers/impex.py 2018-03-05 10:59:22 +0000
3+++ addons/openerp/controllers/impex.py 2018-10-10 07:25:44 +0000
4@@ -588,7 +588,7 @@
5 #Inverting the header into column names
6 try:
7 res = rpc.session.execute('object', 'execute', params.model,
8- 'import_data', fields, datas, 'init', '', False, ctx,
9+ 'import_data_web', fields, datas, 'init', '', False, ctx,
10 False, True, True)
11 except Exception, e:
12 error = {'message':ustr(e), 'title':_('XML-RPC error')}
13
14=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
15--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2018-08-03 15:12:51 +0000
16+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2018-10-10 07:25:44 +0000
17@@ -1,6 +1,10 @@
18 <%!
19 import itertools
20 import cherrypy
21+ import markupsafe
22+
23+ def br(text):
24+ return text.replace('\\n', markupsafe.Markup('<br />'))
25 %>
26 <%
27 object = "new ListView('%s')" % name
28@@ -306,9 +310,9 @@
29 % endif
30 % elif field_attrs.get('displayon') != 'editable':
31 % if (field_attrs.get('function') and not field_attrs.get('store') and not field_attrs.get('allow_sort')) or field_attrs.get('not_sortable'):
32- <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']}</th>
33+ <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>
34 % else:
35- <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)">${field_attrs['string']}</th>
36+ <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)">${field_attrs['string']|br}</th>
37 % endif
38 % endif
39 % endfor

Subscribers

People subscribed via source and target branches