claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow empty klass and improve error message

Browse source
This commit is contained in:
Claude Paroz 2019-08-28 08:51:19 +02:00
parent 323b8b1b34
commit 23072d8086
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
stages/views/imports.py
View file

@ -68,7 +68,7 @@ class ImportViewBase(FormView):
if 'modified' in stats:
messages.info(self.request, "Objets modifiés : %d" % stats['modified'])
if non_fatal_errors:
messages.warning(self.request, "Erreurs rencontrées: %s" % "\n".join(non_fatal_errors))
messages.warning(self.request, "Erreurs rencontrées:\n %s" % "\n".join(non_fatal_errors))
return HttpResponseRedirect(reverse('admin:index'))
@ -131,11 +131,14 @@ class StudentImportView(ImportViewBase):
values['pcode'], _, values['city'] = values['city'].partition(' ')
if 'klass' in values:
try:
k = Klass.objects.get(name=values['klass'])
except Klass.DoesNotExist:
raise Exception("La classe '%s' n'existe pas encore" % values['klass'])
values['klass'] = k
if values['klass'] == '':
values['klass'] = None
else:
try:
k = Klass.objects.get(name=values['klass'])
except Klass.DoesNotExist:
raise Exception("La classe '%s' n'existe pas encore" % values['klass'])
values['klass'] = k
if 'option_ase' in values:
if values['option_ase']:
@ -286,6 +289,11 @@ class StudentImportView(ImportViewBase):
corp.save()
except Corporation.DoesNotExist:
raise
except Corporation.MultipleObjectsReturned:
raise ValueError(
"Il existe plusieurs institutions avec le numéro %s (%s, %s)" % (
corp_values['ext_id'], corp_values['name'], corp_values['city']
))
return corp