summaryrefslogtreecommitdiff
path: root/addons/base_import/static/src/js/import.js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-10-01 16:22:27 +0200
committerXavier Morel <xmo@openerp.com>2012-10-01 16:22:27 +0200
commit771fae90d7f1435eebe682a7dbfa49ac764de436 (patch)
treecc2d1342f29cce81c05038173ebbf661a42f28c8 /addons/base_import/static/src/js/import.js
parent89be614ea3159be3879fbd4e0dd477a8d94e596c (diff)
[IMP] base_import: better warnings when the file parsing has very likely failed
bzr revid: xmo@openerp.com-20121001142227-v1iypgjgfcq4pgo7
Diffstat (limited to 'addons/base_import/static/src/js/import.js')
-rw-r--r--addons/base_import/static/src/js/import.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 90995027021..0ea74e43755 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -171,14 +171,24 @@ openerp.base_import = function (instance) {
'oe_import_noheaders',
!this.$('input.oe_import_has_header').prop('checked'));
if (result.error) {
+ this.$('.oe_import_options').show();
this.$el.addClass('oe_import_preview_error oe_import_error');
this.$('.oe_import_error_report').html(
- QWeb.render('ImportView.preview.error', result));
+ QWeb.render('ImportView.preview.error', result))
+ .get(0).scrollIntoView();
return;
}
this.$el.addClass('oe_import_preview');
this.$('table').html(QWeb.render('ImportView.preview', result));
+ if (result.headers.length === 1) {
+ this.$('.oe_import_options').show();
+ this.render_import_result([{
+ type: 'warning',
+ message: _t("A single column was found in the file, this often means the file separator is incorrect")
+ }]);
+ }
+
var $fields = this.$('.oe_import_fields input');
this.render_fields_matches(result, $fields);
var data = this.generate_fields_completion(result);
@@ -365,7 +375,7 @@ openerp.base_import = function (instance) {
'</div>'
].join('')
},
- }));
+ })).get(0).scrollIntoView();
},
});
};