[MERGE] trunk

bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq

3 files changed, 25 insertions, 4 deletions

diff --git a/addons/base_import/security/ir.model.access.csv b/addons/base_import/security/ir.model.access.csv
new file mode 100644
index 00000000000..7ed063df1c2
--- /dev/null
+++ b/addons/base_import/security/ir.model.access.csv
@@ -0,0 +1,15 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_import_tests_models_char,base.import.tests.models.char,model_base_import_tests_models_char,base.group_user,1,1,1,1
+access_base_import_tests_models_char_required,base.import.tests.models.char.required,model_base_import_tests_models_char_required,base.group_user,1,1,1,1
+access_base_import_tests_models_char_readonly,base.import.tests.models.char.readonly,model_base_import_tests_models_char_readonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_states,base.import.tests.models.char.states,model_base_import_tests_models_char_states,base.group_user,1,1,1,1
+access_base_import_tests_models_char_noreadonly,base.import.tests.models.char.noreadonly,model_base_import_tests_models_char_noreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_stillreadonly,base.import.tests.models.char.stillreadonly,model_base_import_tests_models_char_stillreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o,base.import.tests.models.m2o,model_base_import_tests_models_m2o,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_related,base.import.tests.models.m2o.related,model_base_import_tests_models_m2o_related,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required,base.import.tests.models.m2o.required,model_base_import_tests_models_m2o_required,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required_related,base.import.tests.models.m2o.required.related,model_base_import_tests_models_m2o_required_related,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m,base.import.tests.models.o2m,model_base_import_tests_models_o2m,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m_child,base.import.tests.models.o2m.child,model_base_import_tests_models_o2m_child,base.group_user,1,1,1,1
+access_base_import_tests_models_preview,base.import.tests.models.preview,model_base_import_tests_models_preview,base.group_user,1,1,1,1
+
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 7069886aa12..d29452cc138 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -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');
@@ -205,6 +207,7 @@ openerp.base_import = function (instance) {
         },
         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));
 
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">