entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

manager: fix event index when CSV import file has header (#79845)
gitea/chrono/pipeline/head This commit looks good Details

This commit is contained in:
Valentin Deniaud 2023-07-20 10:59:12 +02:00
parent c1dd25d2c7
commit 95618bd475
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chrono/manager/forms.py
View File

@ -1207,9 +1207,11 @@ class ImportEventsForm(forms.Form):
def clean_events_csv_file(self):
class ValidationErrorWithOrdinal(ValidationError):
line_offset = 1
def __init__(self, message, event_no):
super().__init__(message)
self.message = format_html(message, event_no=mark_safe(ordinal(event_no + 1)))
self.message = format_html(message, event_no=mark_safe(ordinal(event_no + self.line_offset)))
exclude_from_validation = ['desk', 'meeting_type', 'primary_event']
@ -1247,6 +1249,7 @@ class ImportEventsForm(forms.Form):
if len(csvline) < 3:
raise ValidationErrorWithOrdinal(_('Invalid file format. ({event_no} event)'), i)
if i == 0 and csvline[0].strip('#') in ('date', 'Date', _('date'), _('Date')):
ValidationErrorWithOrdinal.line_offset = 0
continue
# label needed to generate a slug

4
tests/manager/test_event.py
View File

@ -808,6 +808,10 @@ def test_import_events(app, admin_user):
resp = resp.form.submit(status=200)
assert 'Invalid file format.' in resp.text
resp.form['events_csv_file'] = Upload('t.csv', b'date,time,etc.\n2016-14-16,18:00,10', 'text/csv')
resp = resp.form.submit(status=200)
assert 'Invalid file format. (date/time format, 1st event)' in resp.text
resp.form['events_csv_file'] = Upload('t.csv', b'2016-14-16,18:00,10', 'text/csv')
resp = resp.form.submit(status=200)
assert 'Invalid file format. (date/time format, 1st event)' in resp.text