1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-02-25 21:46:30 +00:00

Compare commits

..

No commits in common. "e848855072e1b4adc9bf0bc98748b6309029f468" and "d18f76cf8044c54a5f0f8a718fb505eb5861910a" have entirely different histories.

2 changed files with 3 additions and 4 deletions

View File

@ -244,10 +244,9 @@ class UploadNotesForm(forms.Form):
first_name, last_name = tuple(name.split(' ', 1)) first_name, last_name = tuple(name.split(' ', 1))
jury = User.objects.filter(first_name=first_name, last_name=last_name, jury = User.objects.filter(first_name=first_name, last_name=last_name)
registration__volunteerregistration__isnull=False)
if jury.count() != 1: if jury.count() != 1:
self.add_error('file', _("The following user was not found:") + " " + name) self.form.add_error('file', _("The following user was not found:") + " " + name)
continue continue
jury = jury.get() jury = jury.get()

View File

@ -730,7 +730,7 @@ class PoolUploadNotesView(VolunteerMixin, FormView, DetailView):
form.add_error('file', _("The following user is not registered as a jury:") + " " + str(vr)) form.add_error('file', _("The following user is not registered as a jury:") + " " + str(vr))
for i, passage in enumerate(pool.passages.all()): for i, passage in enumerate(pool.passages.all()):
note = Note.objects.get_or_create(jury=vr, passage=passage)[0] note = Note.objects.get(jury=vr, passage=passage)
passage_notes = notes[6 * i:6 * (i + 1)] passage_notes = notes[6 * i:6 * (i + 1)]
note.set_all(*passage_notes) note.set_all(*passage_notes)
note.save() note.save()