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

[IMP] handle lines to skip in import preview 

bzr revid: xmo@openerp.com-20110923095609-ogxc6q3wnd0tez8v
This commit is contained in:
Xavier Morel 2011-09-23 11:56:09 +02:00
parent 8d0a65ec94
commit f42cacc5c1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/controllers/main.py
View File

@ -1419,8 +1419,7 @@ class Import(View):
return fields
@openerpweb.httprequest
def detect_data(self, req, model, csvfile, csvsep, csvdel, csvcode,
csvskip, jsonp):
def detect_data(self, req, model, csvfile, csvsep, csvdel, csvcode, jsonp):
try:
data = list(csv.reader(
csvfile, quotechar=str(csvdel), delimiter=str(csvsep)))
@ -1448,9 +1447,8 @@ class Import(View):
}))
@openerpweb.httprequest
def import_data(self, req, model, csvfile, csvsep, csvdel, csvcode, csvskip,
jsonp):
def import_data(self, req, model, csvfile, csvsep, csvdel, csvcode, jsonp):
# TODO: reintroduce CSVSKIP param
context = req.session.eval_context(req.context)
modle_obj = req.session.model(model)
res = None

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

@ -128,10 +128,13 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
var result_node = this.$element.find("#result");
if (results['records']) {
var lines_to_skip = parseInt(this.$element.find('#csv_skip').val(), 10);
var with_headers = this.$element.find('#file_has_headers').prop('checked');
result_node.append(QWeb.render('ImportView.result', {
'headers': with_headers ? results.records[0] : null,
'records': with_headers ? results.records.slice(1) : results.records
'records': lines_to_skip ? results.records.slice(lines_to_skip)
: with_headers ? results.records.slice(1)
: results.records
}));
} else if (results['error']) {
result_node.append(QWeb.render('ImportView.error', {

2
addons/web/static/src/xml/base.xml
View File

@ -1426,7 +1426,7 @@
</td>
<td><label for="csv_skip" title="For use if CSV files have titles on multiple lines, skips more than a single line during import">
Lines to skip<sup>?</sup>:</label></td>
<td><input type="text" name="csvskip" id="csv_skip" value="0"/></td>
<td><input type="number" id="csv_skip" value="0" min="0"/></td>
</tr>
</table>
</fieldset>