forked from Techsystech/web
[FIX] Export of first one2many field works again
parent
1b3067aae9
commit
f1ee1b1d77
|
@ -37,9 +37,9 @@ openerp.web_export_view = function(instance, m) {
|
||||||
// or assume the main view is a list view and use that
|
// or assume the main view is a list view and use that
|
||||||
var self = this,
|
var self = this,
|
||||||
view = this.getParent(),
|
view = this.getParent(),
|
||||||
columns = view.visible_columns;
|
children = view.getChildren();
|
||||||
if (view.widget_children) {
|
if (children) {
|
||||||
view.widget_children.every(function(child) {
|
children.every(function(child) {
|
||||||
if (child.field && child.field.type == 'one2many') {
|
if (child.field && child.field.type == 'one2many') {
|
||||||
view = child.viewmanager.views.list.controller;
|
view = child.viewmanager.views.list.controller;
|
||||||
return false; // break out of the loop
|
return false; // break out of the loop
|
||||||
|
@ -53,7 +53,7 @@ openerp.web_export_view = function(instance, m) {
|
||||||
}
|
}
|
||||||
export_columns_keys = [];
|
export_columns_keys = [];
|
||||||
export_columns_names = [];
|
export_columns_names = [];
|
||||||
$.each(columns,function(){
|
$.each(view.visible_columns, function(){
|
||||||
if(this.tag=='field'){
|
if(this.tag=='field'){
|
||||||
// non-fields like `_group` or buttons
|
// non-fields like `_group` or buttons
|
||||||
export_columns_keys.push(this.id);
|
export_columns_keys.push(this.id);
|
||||||
|
@ -68,7 +68,7 @@ openerp.web_export_view = function(instance, m) {
|
||||||
if($row.attr('data-id')){
|
if($row.attr('data-id')){
|
||||||
export_row = [];
|
export_row = [];
|
||||||
checked = $row.find('th input[type=checkbox]').attr("checked");
|
checked = $row.find('th input[type=checkbox]').attr("checked");
|
||||||
if (checked === "checked"){
|
if (children || checked === "checked"){
|
||||||
$.each(export_columns_keys,function(){
|
$.each(export_columns_keys,function(){
|
||||||
cell = $row.find('td[data-field="'+this+'"]').get(0);
|
cell = $row.find('td[data-field="'+this+'"]').get(0);
|
||||||
text = cell.text || cell.textContent || cell.innerHTML || "";
|
text = cell.text || cell.textContent || cell.innerHTML || "";
|
||||||
|
|
Loading…
Reference in New Issue