diff --git a/src/agenda_culturel/celery.py b/src/agenda_culturel/celery.py index 54cd38e..4c303cf 100644 --- a/src/agenda_culturel/celery.py +++ b/src/agenda_culturel/celery.py @@ -301,8 +301,9 @@ def run_all_recurrent_imports_failed(self): logger.info("Run only failed imports") imports = RecurrentImport.objects.all().order_by("pk") + imports = [(imp.pk, imp.last_import()) for imp in imports] - run_recurrent_imports_from_list([imp.pk for imp in imports if imp.last_import().status == BatchImportation.STATUS.FAILED]) + run_recurrent_imports_from_list([imp[0] for imp in imports if (not imp[1] is None) and imp[1].status == BatchImportation.STATUS.FAILED]) @app.task(bind=True) def run_all_recurrent_imports_canceled(self): @@ -310,8 +311,9 @@ def run_all_recurrent_imports_canceled(self): logger.info("Run only canceled imports") imports = RecurrentImport.objects.all().order_by("pk") + imports = [(imp.pk, imp.last_import()) for imp in imports] - run_recurrent_imports_from_list([imp.pk for imp in imports if imp.last_import().status == BatchImportation.STATUS.CANCELED]) + run_recurrent_imports_from_list([imp[0] for imp in imports if (not imp[1] is None) and imp[1].status == BatchImportation.STATUS.CANCELED]) @app.task(bind=True) diff --git a/src/agenda_culturel/templates/agenda_culturel/rimports.html b/src/agenda_culturel/templates/agenda_culturel/rimports.html index 196617a..fc1a550 100644 --- a/src/agenda_culturel/templates/agenda_culturel/rimports.html +++ b/src/agenda_culturel/templates/agenda_culturel/rimports.html @@ -28,7 +28,7 @@ Exécuter tout {% picto_from_name "play-circle" %} {% else %} {% if status == "failed" or status == "canceled" %} - Relancer les imports échoués {% picto_from_name "play-circle" %} + Relancer les imports {% if status == "failed" %}échoués{% else %}annulés{% endif %} {% picto_from_name "play-circle" %} {% endif %} {% endif %} Ajouter {% picto_from_name "plus-circle" %}