odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] move sections of import_result around to make flow clearer 

bzr revid: xmo@openerp.com-20111201110140-ozkrhoxt0ug5qcnj
This commit is contained in:
Xavier Morel 2011-12-01 12:01:40 +01:00
parent a724dbfd1f
commit 00ee3a8ba0
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/web/static/src/js/data_import.js
View File

@ -183,6 +183,20 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
this.$element.find('#result').empty();
var headers, result_node = this.$element.find("#result");
if (results['error']) {
result_node.append(QWeb.render('ImportView.error', {
'error': results['error']}));
this.$element.find('fieldset').removeClass('oe-closed');
return;
}
if (results['success']) {
if (this.widget_parent.widget_parent.active_view == "list") {
this.widget_parent.reload_content();
}
this.stop();
return;
}
if (results['records']) {
var lines_to_skip = parseInt(this.$element.find('#csv_skip').val(), 10),
with_headers = this.$element.find('#file_has_headers').prop('checked');
@ -195,17 +209,6 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
: results.records
}));
this.$element.find('fieldset').addClass('oe-closed');
} else if (results['error']) {
result_node.append(QWeb.render('ImportView.error', {
'error': results['error']}));
this.$element.find('fieldset').removeClass('oe-closed');
return;
} else if (results['success']) {
if (this.widget_parent.widget_parent.active_view == "list") {
this.widget_parent.reload_content();
}
this.stop();
return;
}
this.$element.find('form').removeClass('oe-import-no-result');