Merge lp:~openerp-dev/openerp-web/6.1-opw-572791-cpa into lp:openerp-web/6.1

Proposed by Chirag Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/6.1-opw-572791-cpa
Merge into: lp:openerp-web/6.1
Diff against target: 41 lines (+5/-7)
1 file modified
addons/web/static/src/js/view_editor.js (+5/-7)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/6.1-opw-572791-cpa
Reviewer Review Type Date Requested Status
Jiten (OpenERP) (community) Approve
OpenERP Core Team Pending
Review via email: mp+102640@code.launchpad.net

Description of the change

Hello,

Fixed view editor remove tag from xml view when add field.

Demo: Sales > sales orders
1) From the view editor, try to edit the form view of the Sale Order.
2) Add a page on the sale order near 'History" page.
3) Save and update the view.

Observed: Sale order line form view changed.

when add page at that time remove tag "<form string='Sales Order Lines'>" from order_line field.
so sale order line form view changed.

Thanks.

To post a comment you must log in.
Revision history for this message
Jiten (OpenERP) (jiten-openerp) :
review: Approve

Unmerged revisions

2309. By Chirag Patel (OpenERP)

[FIX] Fixed view editor remove tag from xml view when add field.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_editor.js'
2--- addons/web/static/src/js/view_editor.js 2012-02-13 10:53:41 +0000
3+++ addons/web/static/src/js/view_editor.js 2012-04-19 07:28:20 +0000
4@@ -630,11 +630,9 @@
5 insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
6 if (insert.length == _.uniq(check_list).length ) {return xml_child;}
7 });
8+ xml_arch = QWeb.load_xml(arch.arch);
9 }
10- arch_to_pass = _.filter($(arch.arch), function (child) {
11- return child.nodeType == 1;
12- });
13- return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
14+ return self.do_save_xml(xml_arch.documentElement, obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
15 },
16 get_object_by_id: function(id, one_object, result) {
17 var self = this;
18@@ -708,12 +706,12 @@
19 case "After":
20 self.edit_xml_dialog.$element.
21 find("tr[id='viewedit-"+after_append+"']").after(clone);
22- $(arch1).after(update_values[0]);
23+ $(arch1).after($(update_values[0]));
24 child_list.splice(index + 1, 0, object_xml);
25 break;
26 case "Before":
27 tr_click.before(clone);
28- $(arch1).before(update_values[0]);
29+ $(arch1).before($(update_values[0]));
30 child_list.splice(index - 1, 0, object_xml);
31 break;
32 case "Inside":
33@@ -724,7 +722,7 @@
34 self.do_parent_img_hide_show(this);
35 }));
36 }
37- $(arch1).append(update_values[0]);
38+ $(arch1).append($(update_values[0]));
39 self.edit_xml_dialog.$element.
40 find("tr[id='viewedit-"+after_append+"']").after(clone);
41 obj.child_id.push(object_xml);