summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/data_export.js
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-10-06 18:32:38 +0200
committerAntony Lesuisse <al@openerp.com>2012-10-06 18:32:38 +0200
commit55bcd978af814c90b1d486055940f242dfe0dbde (patch)
treee47c8bf7a77644bac7e02348ecc34a4075273098 /addons/web/static/src/js/data_export.js
parentef56fc10d07ad513dcbb27ef76066f44c708fa80 (diff)
parent30069a02398c4f9de698c6fcc43bc4958aa1d960 (diff)
[MERGE] callback2deferred session.rpc
bzr revid: al@openerp.com-20121006163238-7ni5r324c0yqi5a0
Diffstat (limited to 'addons/web/static/src/js/data_export.js')
-rw-r--r--addons/web/static/src/js/data_export.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 1353f59d4a5..b4beb4c3a58 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -51,7 +51,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
self.rpc("/web/export/get_fields", {
model: self.dataset.model,
import_compat: Boolean(import_comp)
- }, function (records) {
+ }).then(function (records) {
got_fields.resolve();
self.on_show_data(records);
});
@@ -59,7 +59,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
return $.when(
got_fields,
- this.rpc('/web/export/formats', {}, this.do_setup_export_formats),
+ this.rpc('/web/export/formats', {}).then(this.do_setup_export_formats),
this.show_exports_list());
},
do_setup_export_formats: function (formats) {
@@ -93,7 +93,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
self.$el.find('#fields_list option').remove();
var export_id = self.$el.find('#saved_export_list option:selected').val();
if (export_id) {
- self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
+ self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}).then(self.do_load_export_field);
}
});
self.$el.find('#delete_export_list').click(function() {
@@ -183,7 +183,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
import_compat: Boolean(import_comp),
parent_field_type : record['field_type'],
exclude: exclude_fields
- }, function(results) {
+ }).then(function(results) {
record.loaded = true;
self.on_show_data(results, record.id);
});