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

Proposed by jftempo
Status: Merged
Merged at revision: 4974
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/US-6480
Merge into: lp:unifield-web
Diff against target: 64 lines (+0/-43)
2 files modified
addons/openerp/widgets/templates/listgrid/listgrid.mako (+0/-21)
addons/openerp/widgets/templates/listgrid/multiple_group.mako (+0/-22)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/US-6480
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+373140@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/templates/listgrid/listgrid.mako'
2--- addons/openerp/widgets/templates/listgrid/listgrid.mako 2019-06-13 14:50:43 +0000
3+++ addons/openerp/widgets/templates/listgrid/listgrid.mako 2019-09-24 13:32:28 +0000
4@@ -422,27 +422,6 @@
5 </tfoot>
6 % endif
7 </table>
8- % if data and 'sequence' in map(lambda x: x[0], itertools.chain(headers,hiddens)) and resequencable:
9- <script type="text/javascript">
10- // flag is used to check sorting is active or not //
11- var is_column_sorted = "${'_terp_sort_key' in cherrypy.request.params.keys()}";
12- if (is_column_sorted == 'False') {
13- jQuery('#${name} tr.grid-row').closest('tbody').sortable({
14- axis: 'y',
15- helper: 'clone',
16- dropOnEmpty: false,
17- items: '> tr.grid-row[record][record!=-1]',
18- stop: function (e, $ui) {
19- new ListView('${name}').dragRow(
20- $ui.item.attr('record'),
21- $ui.item.prevAll().length);
22- }
23- }).bind('mousedown.ui-disableSelection selectstart.ui-disableSelection', function(event) {
24- event.stopImmediatePropagation();
25- }).disableSelection();
26- }
27- </script>
28- % endif
29 % if editors:
30 <script type="text/javascript">
31 /* In editable grid, clicking on empty row will create new and on existing row will edit. */
32
33=== modified file 'addons/openerp/widgets/templates/listgrid/multiple_group.mako'
34--- addons/openerp/widgets/templates/listgrid/multiple_group.mako 2017-01-02 14:59:00 +0000
35+++ addons/openerp/widgets/templates/listgrid/multiple_group.mako 2019-09-24 13:32:28 +0000
36@@ -205,28 +205,6 @@
37 % endif
38 </tr>
39
40- % if 'sequence' in map(lambda x: x[0], itertools.chain(headers,hiddens)):
41- <script type="text/javascript">
42- jQuery('[parent=${grp_row.get('group_by_id')}]').filter('tr.grid-row-group').draggable({
43- revert: 'invalid',
44- connectToSortable: 'tr.grid-row-group',
45- helper: function() {
46- var htmlStr = jQuery(this).html();
47- return jQuery('<table><tr class="ui-widget-header">'+htmlStr+'</tr></table>');
48- },
49- axis: 'y'
50- });
51-
52- jQuery('[parent=${grp_row.get('group_by_id')}]').filter('tr.grid-row-group').droppable({
53- accept : 'tr.grid-row-group[parent=${grp_row.get('group_by_id')}]',
54- hoverClass: 'grid-rowdrop',
55- drop: function(ev, ui) {
56- new ListView('${name}').groupbyDrag(ui.draggable, jQuery(this), '${name}');
57- }
58- });
59- </script>
60- % endif
61-
62
63 % endfor
64 % endfor

Subscribers

People subscribed via source and target branches