public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve CSV import error handling, closes #324

Browse source
This commit is contained in:
witzig 2017-09-29 00:31:38 +02:00
parent b406870756
commit 46acece89c
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
routes/lists.js
View file

@ -636,8 +636,14 @@ function getPreview(path, size, delimiter, callback) {
fs.close(fd, () => { fs.close(fd, () => {
// just ignore // just ignore
}); });
if (err) {
return callback(err);
}
if (!data || !data.length) { if (!data || !data.length) {
return callback(null, new Error(_('Empty file'))); return callback(new Error(_('Empty file')));
}
if (data.length < 2) {
return callback(new Error(_('Too few rows')));
} }
callback(err, data); callback(err, data);
}); });

1
views/lists/subscription/import.hbs
View file

@ -17,6 +17,7 @@
<label for="listimport" class="col-sm-2 control-label">{{#translate}}CSV File{{/translate}}</label> <label for="listimport" class="col-sm-2 control-label">{{#translate}}CSV File{{/translate}}</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="file" class="form-control" name="listimport" id="listimport" required> <input type="file" class="form-control" name="listimport" id="listimport" required>
<span class="help-block">{{#translate}}The first line must contain column headings{{/translate}}</span>
</div> </div>
</div> </div>