summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/data_export.js
diff options
context:
space:
mode:
authorJiten (OpenERP) <jra@tinyerp.com>2012-07-30 14:23:58 +0530
committerJiten (OpenERP) <jra@tinyerp.com>2012-07-30 14:23:58 +0530
commitb60f2a1358357575f85353f6ff079df61e04bcbe (patch)
treea27aaf3ee8bfac113ff8248074795d6b7c8d5629 /addons/web/static/src/js/data_export.js
parente15e32feb2d7b50ca5aa9c0f96b066df203ed45c (diff)
parent4f15336078c3fc2e50a69ed0fc78ac54ac65cd97 (diff)
[MERGE] merged from trunk web.
bzr revid: jra@tinyerp.com-20120730085358-3x0l379npfli3769
Diffstat (limited to 'addons/web/static/src/js/data_export.js')
-rw-r--r--addons/web/static/src/js/data_export.js4
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() {