diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-25 10:26:46 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-25 10:26:46 +0200 |
| commit | 3235ed8a1896fbf24e61982e4c06b7d7f0f1815b (patch) | |
| tree | c563cc1ae571e10d95804cb99ff0e7e51a452986 /addons/web/static/src/js/data_export.js | |
| parent | 974d4f4f106762dafb82b6d6f7a7a43fd6cdacdb (diff) | |
| parent | a4f1ce69ab01818fce1a23fc3744865bcc4fd85c (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120725082646-ff6ljt0pquvm0dup
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() { |