diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-07-27 10:31:54 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-07-27 10:31:54 +0530 |
| commit | 8220b2edf94db13e85b9bb10dd95559be32fd22e (patch) | |
| tree | 9f2bb2e6247c9cf16fa15ee011cf4877ba4dca40 /addons/web/static/src/js/data_export.js | |
| parent | 730d5555f6b8766c0f5871d89b5eb8e14d74dfa5 (diff) | |
| parent | 9128e37231194592b6468ffa7922bbb39b5d7a33 (diff) | |
[MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120727050154-148msw0jzppgc66w
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() { |