diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-25 09:40:53 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-25 09:40:53 +0200 |
| commit | 1d766a2bc6109b8801a3939880bdad45542ecd37 (patch) | |
| tree | 35b13cfce6690bdec8ccdd934b788001cf89e80a /addons/web/static/src/js/data_export.js | |
| parent | fceb94cb8ac1af2fdb6f88e6b86632552075baf1 (diff) | |
| parent | 930dd711ed9369e5a918d2df45878e5421001057 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120725074053-e3gltrdfzm8bb7j8
Diffstat (limited to 'addons/web/static/src/js/data_export.js')
| -rw-r--r-- | addons/web/static/src/js/data_export.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index ebe82ddb4b4..f8e669e1b4a 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -376,7 +376,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ exported_fields.unshift({name: 'id', label: 'External ID'}); var export_format = this.$element.find("#export_format").val(); - $.blockUI(); + instance.web.blockUI(); this.session.get_file({ url: '/web/export/' + export_format, data: {data: JSON.stringify({ @@ -387,7 +387,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ import_compat: Boolean( this.$element.find("#import_compat").val()) })}, - complete: $.unblockUI + complete: instance.web.unblockUI }); }, close: function() { |