[FIX] don't trigger blockUI before displaying potential alerts
authorXavier Morel <xmo@openerp.com>
Tue, 10 Jan 2012 13:30:20 +0000 (14:30 +0100)
committerXavier Morel <xmo@openerp.com>
Tue, 10 Jan 2012 13:30:20 +0000 (14:30 +0100)
bzr revid: xmo@openerp.com-20120110133020-etejse7odvr8ancj

addons/web/static/src/js/data_export.js

index 78dc3be..c6fe964 100644 (file)
@@ -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,24 +349,24 @@ 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;
         }
 
         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,
             data: {data: JSON.stringify({