[IMP] data_export: when exporting on active_domain instead of
selected ids, display a message to tell the user what he is doing. bzr revid: tde@openerp.com-20131017094457-q1b7j3927eeoy4fo
This commit is contained in:
@@ -62,8 +62,21 @@ instance.web.DataExport = instance.web.Dialog.extend({
|
||||
});
|
||||
}).change();
|
||||
|
||||
var got_domain = this.getParent().get_active_domain().then(function (domain) {
|
||||
if (domain === undefined) {
|
||||
self.ids_to_export = self.getParent().get_selected_ids();
|
||||
self.domain = self.dataset.domain;
|
||||
}
|
||||
else {
|
||||
self.ids_to_export = false;
|
||||
self.domain = domain;
|
||||
}
|
||||
self.on_show_domain();
|
||||
});
|
||||
|
||||
return $.when(
|
||||
got_fields,
|
||||
got_domain,
|
||||
this.rpc('/web/export/formats', {}).done(this.do_setup_export_formats),
|
||||
this.show_exports_list());
|
||||
},
|
||||
@@ -196,6 +209,9 @@ instance.web.DataExport = instance.web.Dialog.extend({
|
||||
self.showcontent(record.id);
|
||||
}
|
||||
},
|
||||
on_show_domain: function() {
|
||||
this.$el.find('tr').first().find('td').append(QWeb.render('ExportTreeView-Domain', {'record': this}));
|
||||
},
|
||||
on_show_data: function(result, after) {
|
||||
var self = this;
|
||||
|
||||
@@ -384,27 +400,17 @@ instance.web.DataExport = instance.web.Dialog.extend({
|
||||
|
||||
var export_format = this.$el.find("#export_format").val();
|
||||
|
||||
this.getParent().get_active_domain().then(function (domain) {
|
||||
if (domain === undefined) {
|
||||
var ids_to_export = self.getParent().get_selected_ids();
|
||||
var domain = self.dataset.domain;
|
||||
}
|
||||
else {
|
||||
var ids_to_export = false;
|
||||
var domain = domain;
|
||||
}
|
||||
instance.web.blockUI();
|
||||
self.session.get_file({
|
||||
url: '/web/export/' + export_format,
|
||||
data: {data: JSON.stringify({
|
||||
model: self.dataset.model,
|
||||
fields: exported_fields,
|
||||
ids: ids_to_export,
|
||||
domain: domain,
|
||||
import_compat: !!self.$el.find("#import_compat").val(),
|
||||
})},
|
||||
complete: instance.web.unblockUI,
|
||||
});
|
||||
instance.web.blockUI();
|
||||
this.session.get_file({
|
||||
url: '/web/export/' + export_format,
|
||||
data: {data: JSON.stringify({
|
||||
model: this.dataset.model,
|
||||
fields: exported_fields,
|
||||
ids: this.ids_to_export,
|
||||
domain: this.domain,
|
||||
import_compat: !!this.$el.find("#import_compat").val(),
|
||||
})},
|
||||
complete: instance.web.unblockUI,
|
||||
});
|
||||
},
|
||||
close: function() {
|
||||
|
||||
@@ -1775,6 +1775,14 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<t t-name="ExportTreeView-Domain">
|
||||
<t t-if="! record.ids_to_export">
|
||||
<p><strong>Please pay attention that all records matching your search filter will be exported. Not only the selected ids.</strong></p>
|
||||
</t>
|
||||
<t t-if="record.ids_to_export">
|
||||
<p><strong>Please note that only the selected ids will be exported.</strong></p>
|
||||
</t>
|
||||
</t>
|
||||
<table t-name="ExportTreeView-Secondary"
|
||||
id="field-tree-structure" class="oe_export_fields_selector_export"
|
||||
cellspacing="0" cellpadding="0">
|
||||
|
||||
Reference in New Issue
Block a user