Skip to content
Snippets Groups Projects
Commit ea7fb0a9 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch '7-slug-for-event-must-not-be-the-short-name-of-the-group' of...

Merge branch '7-slug-for-event-must-not-be-the-short-name-of-the-group' of edugit.org:Teckids/hacknfun/AlekSIS-App-Paweljong into 7-slug-for-event-must-not-be-the-short-name-of-the-group
parents 503a13f8 e6e2a873
No related branches found
No related tags found
1 merge request!6Resolve "Slug for event must not be the short_name of the group"
# Generated by Django 3.2.12 on 2022-02-21 19:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('paweljong', '0011_registration_accepted_terms'),
]
operations = [
migrations.AddField(
model_name='event',
name='slug',
field=models.SlugField(max_length=255, verbose_name='Slug'),
preserve_default=False,
),
]
...@@ -4,6 +4,7 @@ from django.db import models ...@@ -4,6 +4,7 @@ from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.utils.text import slugify
from ckeditor.fields import RichTextField from ckeditor.fields import RichTextField
from django_iban.fields import IBANField from django_iban.fields import IBANField
...@@ -31,7 +32,7 @@ class Event(ExtensibleModel): ...@@ -31,7 +32,7 @@ class Event(ExtensibleModel):
description = models.CharField(max_length=500, verbose_name=_("Description")) description = models.CharField(max_length=500, verbose_name=_("Description"))
published = models.BooleanField(default=False, verbose_name=_("Publish")) published = models.BooleanField(default=False, verbose_name=_("Publish"))
place = models.CharField(max_length=50, verbose_name="Place") place = models.CharField(max_length=50, verbose_name="Place")
slug models.SlugField(max_length=255, verbose_name=_("Slug")) slug = models.SlugField(max_length=255, verbose_name=_("Slug"))
# Date details # Date details
date_event = models.DateField(verbose_name=_("Date of event")) date_event = models.DateField(verbose_name=_("Date of event"))
...@@ -44,6 +45,15 @@ class Event(ExtensibleModel): ...@@ -44,6 +45,15 @@ class Event(ExtensibleModel):
information = RichTextField(verbose_name=_("Information about the event")) information = RichTextField(verbose_name=_("Information about the event"))
terms = models.ManyToManyField(Terms, verbose_name=_("Terms"), related_name="event", blank=True) terms = models.ManyToManyField(Terms, verbose_name=_("Terms"), related_name="event", blank=True)
def save(self. *args, **kwargs):
if not self.slug:
if self.linked_group.short_name:
self.slug = slugify(self.linked_group.short_name)
else:
self.slug = slugify(self.display_name)
return super().save(*args, **kwargs)
def __str__(self) -> str: def __str__(self) -> str:
return self.display_name return self.display_name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment