Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #816 from hbrunn/8.0-web_export_view-active_domain 

[8.0] web_export_view: Various fixes
pull/283/merge
Stefan Rijnhart (Opener) 2018-01-26 14:53:28 +01:00 committed by GitHub
parent 1f77e3adc8 c223b991ce
commit 8f15ffc2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
web_export_view/static/src/js/web_export_view.js
View File

@ -37,6 +37,7 @@ openerp.web_export_view = function (instance) {
// 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(),
fields_view = view.fields_view,
children = view.getChildren(), children = view.getChildren(),
deferred = new jQuery.Deferred(); deferred = new jQuery.Deferred();
if (children) { if (children) {
@ -76,9 +77,63 @@ openerp.web_export_view = function (instance) {
else { else {
deferred = view.dataset.read_slice(export_columns_keys); deferred = view.dataset.read_slice(export_columns_keys);
export_columns_names.push( export_columns_names.push(
String(view.dataset.domain || _('All records')) _t('Selected records:') + ' ' +
String(
_(view.ViewManager.searchview.query.pluck('values'))
.chain().flatten(true).pluck('label').value()
.join('; ') || _('All records')
)
); );
} }
var x2many = _(export_columns_keys).filter(function(field) {
return ['one2many', 'many2many']
.indexOf(fields_view.fields[field].type) > -1;
});
if(x2many.length) {
deferred = deferred.then(function(records) {
var name_gets = [], names = {};
_(records).chain().map(function(record) {
return _(record).chain().pairs().filter(function(pair)
{
return x2many.indexOf(pair[0]) > -1;
})
.value()
})
.flatten(true)
.groupBy(0)
.each(function(pairs, field) {
name_gets.push(
new instance.web.Model(
fields_view.fields[field].relation
)
.call('name_get', [
_(pairs).chain().pluck(1).flatten(true)
.value(),
view.dataset.get_context()
])
.then(function(name_gets) {
names[field] = _.object(name_gets);
})
);
})
return jQuery.when.apply(jQuery, name_gets)
.then(function() {
_(records).each(function(record) {
_(x2many).each(function(field) {
record[field] = _(record[field])
.map(function(id) {
return names[field][id];
})
.join(', ');
record[
_.str.sprintf('%s__display', field)
] = record[field];
});
});
return records;
});
});
}
return deferred.then(function(records) { return deferred.then(function(records) {
var export_rows = []; var export_rows = [];
$.each(records, function(index, record) { $.each(records, function(index, record) {
@ -87,9 +142,9 @@ openerp.web_export_view = function (instance) {
$.each(view.visible_columns, function() { $.each(view.visible_columns, function() {
export_row.push( export_row.push(
this.type != 'integer' && this.type != 'float' ? this.type != 'integer' && this.type != 'float' ?
this.format( jQuery('<div/>').html(this.format(
record.data, {process_modifiers: false} record.data, {process_modifiers: false}
) : record.data[this.id].value )).text() : record.data[this.id].value
); );
}) })
export_rows.push(export_row); export_rows.push(export_row);