From e71cb3a17382a9a7d810b2cf96e7a60a5de3039c Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Mon, 26 Dec 2011 16:17:25 +0530
Subject: [PATCH 1/2] [FIX] translation,return on no export.

lp bug: https://launchpad.net/bugs/908723 fixed

bzr revid: vda@tinyerp.com-20111226104725-0ob6e71f8elppu95
---
 addons/web/static/src/js/data_export.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 78dc3bef1f9..2b30a40d536 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -114,7 +114,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
                 if (value) {
                     self.do_save_export_list(value);
                 } else {
-                    alert("Pleae Enter Save Field List Name");
+                    alert(_t("Please Enter Save Field List Name"));
                 }
             });
         } else {
@@ -349,19 +349,19 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
             export_field.push($(this).val());
         });
         if (!export_field.length) {
-            alert('Please select fields to save export list...');
+            alert(_t('Please select fields to save export list...'));
         }
         return export_field;
     },
     on_click_export_data: function() {
-        $.blockUI(this.$element);
+        
         var exported_fields = [], self = this;
         this.$element.find("#fields_list option").each(function() {
             var fieldname = self.records[$(this).val()];
             exported_fields.push({name: fieldname, label: $(this).text()});
         });
         if (_.isEmpty(exported_fields)) {
-            alert('Please select fields to export...');
+            alert(_t('Please select fields to export...'));
             return;
         }
 
@@ -369,6 +369,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
         var export_format = this.$element.find("#export_format").val();
         this.session.get_file({
             url: '/web/export/' + export_format,
+            beforeSend: $.blockUI(this.$element),
             data: {data: JSON.stringify({
                 model: this.dataset.model,
                 fields: exported_fields,

From 9c85ae387ad389024a451120be134709a4e3611d Mon Sep 17 00:00:00 2001
From: "Vaibhav (OpenERP)" <vda@tinyerp.com>
Date: Tue, 10 Jan 2012 18:29:14 +0530
Subject: [PATCH 2/2] [FIX] block ui before rpc call.

bzr revid: vda@tinyerp.com-20120110125914-04oy2rilkdq793w0
---
 addons/web/static/src/js/data_export.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 2b30a40d536..ab7ea5e6163 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -114,7 +114,7 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
                 if (value) {
                     self.do_save_export_list(value);
                 } else {
-                    alert(_t("Please Enter Save Field List Name"));
+                    alert(_t("Please enter save field list name"));
                 }
             });
         } else {
@@ -354,7 +354,6 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
         return export_field;
     },
     on_click_export_data: function() {
-        
         var exported_fields = [], self = this;
         this.$element.find("#fields_list option").each(function() {
             var fieldname = self.records[$(this).val()];
@@ -367,9 +366,9 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
 
         exported_fields.unshift({name: 'id', label: 'External ID'});
         var export_format = this.$element.find("#export_format").val();
+        $.blockUI();
         this.session.get_file({
             url: '/web/export/' + export_format,
-            beforeSend: $.blockUI(this.$element),
             data: {data: JSON.stringify({
                 model: this.dataset.model,
                 fields: exported_fields,