diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-09-23 11:45:00 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-09-23 11:45:00 +0200 |
| commit | 8d0a65ec94b99531168b46cbb4ac564c2c58dd5a (patch) | |
| tree | 63ca1a8f85f8df2a424a40ba918a077ca2ae4cff /addons/web/static/src | |
| parent | a7a71dea83ac33d7f67e0068c5a5102f80e86856 (diff) | |
[IMP] handle switch indicating whether the CSV file being imported has headers
bzr revid: xmo@openerp.com-20110923094500-0jn0tb3fgix9j8wg
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/data_import.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index 9d77a68e54f..3998c437727 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -33,7 +33,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ this.model = parent.model; this.fields = []; this.all_fields = []; - this.required_fields; + this.required_fields = null; var convert_fields = function (root, prefix) { prefix = prefix || ''; @@ -128,9 +128,10 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ var result_node = this.$element.find("#result"); if (results['records']) { + var with_headers = this.$element.find('#file_has_headers').prop('checked'); result_node.append(QWeb.render('ImportView.result', { - 'headers': results.records[0], - 'records': results.records.slice(1) + 'headers': with_headers ? results.records[0] : null, + 'records': with_headers ? results.records.slice(1) : results.records })); } else if (results['error']) { result_node.append(QWeb.render('ImportView.error', { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index db7663ed60d..354189ac4a5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1407,8 +1407,7 @@ <td colspan="4"> <label for="file_has_headers">Does your file have titles?</label> <input type="checkbox" checked="checked" - id="file_has_headers" - name="file_has_headers"/> + id="file_has_headers"/> </td> </tr> <tr> @@ -1435,12 +1434,12 @@ </t> <table t-name="ImportView.result" class="oe_import_grid" width="100%" style="margin: 5px 0;"> - <tr class="oe_import_grid-header"> + <tr t-if="headers" class="oe_import_grid-header"> <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"> <t t-esc="header"/></td> </tr> <tr> - <td t-foreach="headers" t-as="header"> + <td t-foreach="records[0]" t-as="column"> <input class="sel_fields"/> </td> </tr> |