diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-04-11 15:10:28 +0200 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-04-11 15:10:28 +0200 |
| commit | fb912d82beae89ef75433d43bfce6966eeee0c0b (patch) | |
| tree | 63e55a61d95df2aaa71a4354019f3d7e2ecb35b6 /addons/web/static/src/js/data_export.js | |
| parent | 004fa1f1acdcc68a5d138f68da674630e22cd1df (diff) | |
| parent | 60f74ff3f4c7bb1e5208b0f4be3ef2577a5645f4 (diff) | |
[MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140411131028-fqudb40nz71qhwc6
Diffstat (limited to 'addons/web/static/src/js/data_export.js')
| -rw-r--r-- | addons/web/static/src/js/data_export.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 2725e18ea6e..252a5a378cc 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -119,6 +119,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ if (select_exp.val()) { self.exports.unlink([parseInt(select_exp.val(), 10)]); select_exp.remove(); + self.$el.find("#fields_list option").remove(); if (self.$el.find('#saved_export_list option').length <= 1) { self.$el.find('#ExistsExportList').hide(); } @@ -166,18 +167,16 @@ instance.web.DataExport = instance.web.Dialog.extend({ export_fields: _(fields).map(function (field) { return [0, 0, {name: field}]; }) - }, function (export_list_id) { - if (!export_list_id.result) { + }).then(function (export_list_id) { + if (!export_list_id) { return; } - self.$el.find("#saved_export_list").append( - new Option(value, export_list_id.result)); - if (self.$el.find("#saved_export_list").is(":hidden")) { + if (!self.$el.find("#saved_export_list").length || self.$el.find("#saved_export_list").is(":hidden")) { self.show_exports_list(); } + self.$el.find("#saved_export_list").append( new Option(value, export_list_id) ); }); this.on_show_save_list(); - this.$el.find("#fields_list option").remove(); }, on_click: function(id, record) { var self = this; |