Merge with trunk

bzr revid: rgaopenerp-20121109052743-v8ts1k78k37dfgpx

2 files changed, 14 insertions, 8 deletions

diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 510afaaead8..d29452cc138 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -139,7 +139,7 @@ openerp.base_import = function (instance) {
                 this._super(),
                 this.Import.call('create', [{
                     'res_model': this.res_model
-                }]).then(function (id) {
+                }]).done(function (id) {
                     self.id = id;
                     self.$('input[name=import_id]').val(id);
                 })
@@ -179,7 +179,8 @@ openerp.base_import = function (instance) {
 
         //- File & settings change section
         onfile_loaded: function () {
-            this.$('.oe_import_button').prop('disabled', true);
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', true);
             if (!this.$('input.oe_import_file').val()) { return; }
 
             this.$el.removeClass('oe_import_preview oe_import_error');
@@ -189,7 +190,8 @@ openerp.base_import = function (instance) {
         },
         onpreviewing: function () {
             var self = this;
-            this.$('.oe_import_button').prop('disabled', true);
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', true);
             this.$el.addClass('oe_import_with_file');
             // TODO: test that write // succeeded?
             this.$el.removeClass('oe_import_preview_error oe_import_error');
@@ -198,13 +200,14 @@ openerp.base_import = function (instance) {
                 !this.$('input.oe_import_has_header').prop('checked'));
             this.Import.call(
                 'parse_preview', [this.id, this.import_options()])
-                .then(function (result) {
+                .done(function (result) {
                     var signal = result.error ? 'preview_failed' : 'preview_succeeded';
                     self[signal](result);
                 });
         },
         onpreview_error: function (event, from, to, result) {
             this.$('.oe_import_options').show();
+            this.$('.oe_import_file_reload').prop('disabled', false);
             this.$el.addClass('oe_import_preview_error oe_import_error');
             this.$('.oe_import_error_report').html(
                     QWeb.render('ImportView.preview.error', result));
@@ -212,7 +215,8 @@ openerp.base_import = function (instance) {
         onpreview_success: function (event, from, to, result) {
             this.$('.oe_import_import').removeClass('oe_highlight');
             this.$('.oe_import_validate').addClass('oe_highlight');
-            this.$('.oe_import_button').prop('disabled', false);
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', false);
             this.$el.addClass('oe_import_preview');
             this.$('table').html(QWeb.render('ImportView.preview', result));
 
@@ -337,11 +341,11 @@ openerp.base_import = function (instance) {
         },
         onvalidate: function () {
             return this.call_import({ dryrun: true })
-                .then(this.proxy('validated'));
+                .done(this.proxy('validated'));
         },
         onimport: function () {
             var self = this;
-            return this.call_import({ dryrun: false }).then(function (message) {
+            return this.call_import({ dryrun: false }).done(function (message) {
                 if (!_.any(message, function (message) {
                         return message.type === 'error' })) {
                     self['import_succeeded']();
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index a121c15f8c8..0da75eb69b9 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -30,7 +30,9 @@
                 <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
                 <input type="file" id-attf-id="file_#{_id}"
                        name="file" class="oe_import_file"/>
-                <button type="button" class="oe_import_file_reload" title="Reload data to check changes.">
+                <button type="button" class="oe_import_file_reload"
+                        disabled="disabled"
+                        title="Reload data to check changes.">
                     <img src="/web/static/src/img/icons/gtk-refresh.png"/>
                 </button>
                 <div class="oe_import_with_file">