Merge lp:~julie-w/unifield-web/UTP-1138 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4782
Proposed branch: lp:~julie-w/unifield-web/UTP-1138
Merge into: lp:unifield-web
Diff against target: 16 lines (+5/-1)
1 file modified
addons/openerp/static/javascript/listgrid.js (+5/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-web/UTP-1138
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+287902@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/static/javascript/listgrid.js'
2--- addons/openerp/static/javascript/listgrid.js 2016-01-06 16:54:24 +0000
3+++ addons/openerp/static/javascript/listgrid.js 2016-03-03 10:46:45 +0000
4@@ -959,7 +959,11 @@
5 var editable_field = MochiKit.DOM.getElement(self.name + '/_terp_editable');
6 previous_not_editable = editable_field && editable_field.value == '0'
7 //console.log('previous_not_editable ' + previous_not_editable + ' '+self.name);
8- $list.parent().replaceWith(obj.view);
9+
10+ // (UTP-1138) ".parent()" added.
11+ // Without that the tag '<div class="box-a list-a">' would be duplicated each time
12+ $list.parent().parent().replaceWith(obj.view);
13+
14 if (previous_not_editable) {
15 //console.log('Set readonly');
16 new One2Many(self.name).setReadonly(true);

Subscribers

People subscribed via source and target branches