Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[merge]

7.0
Leonardo Pistone 2013-07-23 16:25:11 +02:00
parent a2b40640c0 f1ee1b1d77
commit 5f99105655
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_export_view/controllers.py
View File

@ -45,5 +45,5 @@ class ExcelExportView(ExcelExport):
% self.filename(model)),
('Content-Type', self.content_type)
],
cookies={'fileToken': int(token)}
cookies={'fileToken': token}
)

10
web_export_view/static/js/web_advanced_export.js
View File

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