jmtrivial/agenda_culturel
4
4
Fork 0
Code Issues 61 Pull Requests 1 Projects 1 Releases Wiki Activity

On corrige un bug en cas de création sans run

Browse Source
This commit is contained in:
Jean-Marie Favreau 2024-09-22 12:15:24 +02:00
parent e04d94f97a
commit 2bc1f36139
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/agenda_culturel/models.py
View File

@ -1364,7 +1364,10 @@ class RecurrentImport(models.Model):
events = BatchImportation.objects.filter(recurrentImport=self).order_by( events = BatchImportation.objects.filter(recurrentImport=self).order_by(
"-created_date" "-created_date"
) )
if events and len(events) > 0:
return events[0] return events[0]
else:
return None
class BatchImportation(models.Model): class BatchImportation(models.Model):

2
src/agenda_culturel/templates/agenda_culturel/rimports.html
View File

@ -82,7 +82,7 @@
</td> </td>
<td> <td>
<div class="buttons"> <div class="buttons">
{% if obj.last_import.status != "running" %} {% if not obj.last_import or obj.last_import.status != "running" %}
<a href="{% url 'run_rimport' obj.pk %}" role="button">Exécuter</a> <a href="{% url 'run_rimport' obj.pk %}" role="button">Exécuter</a>
{% else %} {% else %}
<a href="{% url 'cancel_import' obj.last_import.pk %}" role="button">Annuler</a> <a href="{% url 'cancel_import' obj.last_import.pk %}" role="button">Annuler</a>