odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] FormRenderingEngine losing text nodes. 

bzr revid: fme@openerp.com-20120530093446-idhvo9n1so65q28x
This commit is contained in:
Fabien Meghazi 2012-05-30 11:34:46 +02:00
parent d1318ad8fa
commit 5a65e3459b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web/static/src/js/view_form.js
View File

@ -953,7 +953,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var obj = self.tags_registry.get_object(tag_name);
var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
w.replace($elem);
})
});
// TODO: return a deferred
},
render_element: function(template, layout/* dictionaries */) {
@ -1006,7 +1006,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var $new_sheet = this.render_element('FormRenderingSheet', layout, $sheet.getAttributes());
this.handle_common_properties($new_sheet, $sheet);
var $dst = (layout === 'auto') ? $new_sheet.find('group:first') : $new_sheet.find('.oe_form_sheet');
$sheet.children().appendTo($dst);
$sheet.contents().appendTo($dst);
$sheet.before($new_sheet).remove();
this.process($new_sheet, layout);
},
@ -1014,7 +1014,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var $new_form = this.render_element('FormRenderingForm', layout, $form.getAttributes());
this.handle_common_properties($new_form, $form);
var $dst = (layout === 'auto') ? $new_form.find('group:first') : $new_form;
$form.children().appendTo($dst);
$form.contents().appendTo($dst);
if ($form[0] === this.$form[0]) {
// If root element, replace it
this.$form = $new_form;
@ -1195,12 +1195,12 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
pages.push(page_attrs);
var $new_page = self.render_element('FormRenderingNotebookPage', layout, page_attrs);
var $dst = (layout === 'auto') ? $new_page.find('group:first') : $new_page;
$page.children().appendTo($dst);
$page.contents().appendTo($dst);
$page.before($new_page).remove();
self.handle_common_properties($new_page, $page);
});
var $new_notebook = this.render_element('FormRenderingNotebook', layout, { pages : pages });
$notebook.children().appendTo($new_notebook);
$notebook.contents().appendTo($new_notebook);
$notebook.before($new_notebook).remove();
$new_notebook.children().each(function() {
self.process($(this));