From 00df29ef4df99c2f5f2cd8fa6baf3ca42745f9cf Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 14 Oct 2023 18:35:53 +0200 Subject: [PATCH] =?UTF-8?q?On=20utilise=20l'ID=20plut=C3=B4t=20qu'un=20UUI?= =?UTF-8?q?D,=20parce=20que=20sinon=20c'est=20gal=C3=A8re?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0001_initial.py | 36 --------------- ...t_end_day_alter_event_end_time_and_more.py | 44 ------------------- src/agenda_culturel/models.py | 10 +---- .../templates/agenda_culturel/home.html | 2 +- src/agenda_culturel/urls.py | 2 +- 5 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 src/agenda_culturel/migrations/0001_initial.py delete mode 100644 src/agenda_culturel/migrations/0002_alter_event_end_day_alter_event_end_time_and_more.py diff --git a/src/agenda_culturel/migrations/0001_initial.py b/src/agenda_culturel/migrations/0001_initial.py deleted file mode 100644 index 0925219..0000000 --- a/src/agenda_culturel/migrations/0001_initial.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 4.2.1 on 2023-10-14 09:53 - -import django.contrib.postgres.fields -from django.db import migrations, models -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Event', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), - ('slug', models.SlugField(editable=False, unique=True)), - ('created_date', models.DateTimeField(auto_now_add=True)), - ('modified_date', models.DateTimeField(auto_now=True)), - ('title', models.CharField(help_text='Short title', max_length=512, verbose_name='Title')), - ('status', models.CharField(choices=[('published', 'Published'), ('trash', 'Trash'), ('draft', 'draft')], default='published', max_length=20, verbose_name='Status')), - ('start_day', models.DateField(help_text='Day of the event', verbose_name='Day of the event')), - ('start_time', models.TimeField(help_text='Starting time', verbose_name='Starting time')), - ('end_day', models.DateField(help_text='End day of the event, only required if different from the start day.', verbose_name='End day of the event')), - ('end_time', models.TimeField(help_text='Final time', verbose_name='Final time')), - ('location', models.CharField(help_text='Address of the event', max_length=512, verbose_name='Location')), - ('description', models.TextField(blank=True, help_text='General description of the event', null=True, verbose_name='Description')), - ('image', models.URLField(help_text='URL of the illustration image', verbose_name='Illustration')), - ('image_alt', models.CharField(help_text='Alternative text used by screen readers for the image', max_length=512, verbose_name='Illustration description')), - ('reference_urls', django.contrib.postgres.fields.ArrayField(base_field=models.URLField(), help_text='List of all the urls where this event can be found.', size=None, verbose_name='URLs')), - ], - ), - ] diff --git a/src/agenda_culturel/migrations/0002_alter_event_end_day_alter_event_end_time_and_more.py b/src/agenda_culturel/migrations/0002_alter_event_end_day_alter_event_end_time_and_more.py deleted file mode 100644 index a76eea1..0000000 --- a/src/agenda_culturel/migrations/0002_alter_event_end_day_alter_event_end_time_and_more.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 4.2.1 on 2023-10-14 10:04 - -import django.contrib.postgres.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('agenda_culturel', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='event', - name='end_day', - field=models.DateField(blank=True, help_text='End day of the event, only required if different from the start day.', null=True, verbose_name='End day of the event'), - ), - migrations.AlterField( - model_name='event', - name='end_time', - field=models.TimeField(blank=True, help_text='Final time', null=True, verbose_name='Final time'), - ), - migrations.AlterField( - model_name='event', - name='image', - field=models.URLField(blank=True, help_text='URL of the illustration image', null=True, verbose_name='Illustration'), - ), - migrations.AlterField( - model_name='event', - name='image_alt', - field=models.CharField(blank=True, help_text='Alternative text used by screen readers for the image', max_length=512, null=True, verbose_name='Illustration description'), - ), - migrations.AlterField( - model_name='event', - name='reference_urls', - field=django.contrib.postgres.fields.ArrayField(base_field=models.URLField(), blank=True, help_text='List of all the urls where this event can be found.', null=True, size=None, verbose_name='URLs'), - ), - migrations.AlterField( - model_name='event', - name='start_time', - field=models.TimeField(blank=True, help_text='Starting time', null=True, verbose_name='Starting time'), - ), - ] diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index eeb46be..1ed025c 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -3,7 +3,6 @@ from django.contrib.postgres.fields import ArrayField from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import slugify # new from django.urls import reverse -import uuid from django.template.defaultfilters import date as _date from datetime import datetime @@ -16,8 +15,6 @@ class Event(models.Model): TRASH = "trash", _("Trash") DRAFT = "draft", _("Draft") - id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) - slug = models.SlugField(null=False, unique=True, editable=False) created_date = models.DateTimeField(auto_now_add=True) modified_date = models.DateTimeField(auto_now=True) @@ -41,12 +38,7 @@ class Event(models.Model): reference_urls = ArrayField(models.URLField(max_length=200), verbose_name=_('URLs'), help_text=_("List of all the urls where this event can be found."), blank=True, null=True) def get_absolute_url(self): - return reverse("view_event", kwargs={"slug": self.slug}) - - def save(self, *args, **kwargs): # new - if not self.slug: - self.slug = slugify(str(self.id) + "-" + self.title) - return super().save(*args, **kwargs) + return reverse("view_event", kwargs={"pk": self.pk, "extra": self.title}) def __str__(self): return _date(self.start_day) + ": " + self.title diff --git a/src/agenda_culturel/templates/agenda_culturel/home.html b/src/agenda_culturel/templates/agenda_culturel/home.html index 901c0d6..1da615a 100644 --- a/src/agenda_culturel/templates/agenda_culturel/home.html +++ b/src/agenda_culturel/templates/agenda_culturel/home.html @@ -1,7 +1,7 @@

Événements