Compare commits

...

10 Commits

9 changed files with 63 additions and 5 deletions

View File

@ -5,6 +5,7 @@ from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin
from django_better_admin_arrayfield.forms.widgets import DynamicArrayWidget
from django_better_admin_arrayfield.models.fields import DynamicArrayField
admin.site.register(EventSubmissionForm)
admin.site.register(Category)
admin.site.register(StaticContent)

View File

@ -0,0 +1,19 @@
# Generated by Django 4.2.7 on 2023-11-15 15:26
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('agenda_culturel', '0002_alter_event_category'),
]
operations = [
migrations.AlterField(
model_name='event',
name='category',
field=models.ForeignKey(default=None, help_text='Category of the event', null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='agenda_culturel.category', verbose_name='Category'),
),
]

View File

@ -0,0 +1,19 @@
# Generated by Django 4.2.7 on 2023-11-15 15:38
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('agenda_culturel', '0003_alter_event_category'),
]
operations = [
migrations.AlterField(
model_name='event',
name='category',
field=models.ForeignKey(default=1, help_text='Category of the event', null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='agenda_culturel.category', verbose_name='Category'),
),
]

View File

@ -1,7 +1,7 @@
from django.db import models
from django_better_admin_arrayfield.models.fields import ArrayField
from django.utils.translation import gettext_lazy as _
from django.template.defaultfilters import slugify # new
from django.template.defaultfilters import slugify
from django.urls import reverse
from colorfield.fields import ColorField
from ckeditor.fields import RichTextField
@ -124,7 +124,7 @@ class Event(models.Model):
return not self.end_day or self.end_day == self.start_day
def get_absolute_url(self):
return reverse("view_event", kwargs={"pk": self.pk, "extra": self.title})
return reverse("view_event", kwargs={"pk": self.pk, "extra": slugify(self.title)})
def __str__(self):
return _date(self.start_day) + ": " + self.title
@ -164,4 +164,4 @@ class EventSubmissionForm(models.Model):
verbose_name_plural = _("Event submissions forms")
def __str__(self):
return self.url
return self.url

View File

@ -17,6 +17,9 @@ ALLOWED_HOSTS = os_getenv("ALLOWED_HOSTS", "localhost").split(",")
if DEBUG:
CSRF_TRUSTED_ORIGINS = os_getenv("CSRF_TRUSTED_ORIGINS", "http://localhost").split(
","
)
CORS_ORIGIN_ALLOW_ALL = True
else:
CSRF_TRUSTED_ORIGINS = os_getenv("CSRF_TRUSTED_ORIGINS", "http://localhost").split(
@ -157,7 +160,7 @@ REDIS_DB_KEYS = {
"prod": 2,
}
# Redis settings
# Redis settingsEMAIL_USE_TLS
REDIS_HOST = os_getenv("REDIS_HOST", "redis")
REDIS_PORT = os_getenv("REDIS_PORT", 6379)
@ -174,3 +177,16 @@ CELERY_RESULT_BACKEND = REDIS_URL
COMPRESS_PRECOMPILERS = (
('text/x-scss', 'django_libsass.SassCompiler'),
)
# EMAIL settings
if os_getenv("EMAIL_BACKEND"):
EMAIL_BACKEND = os_getenv("EMAIL_BACKEND")
EMAIL_HOST = os_getenv("EMAIL_HOST")
EMAIL_PORT = os_getenv("EMAIL_PORT")
EMAIL_HOST_USER = os_getenv("EMAIL_HOST_USER")
EMAIL_HOST_PASSWORD = os_getenv("EMAIL_HOST_PASSWORD")
EMAIL_USE_TLS = os_getenv("EMAIL_USE_TLS", False)
EMAIL_USE_SSL = os_getenv("EMAIL_USE_SSL", False)
DEFAULT_FROM_EMAIL = os_getenv("DEFAULT_FROM_EMAIL")

View File

@ -3,6 +3,7 @@
{% block title %}Proposer un événement{% endblock %}
{% block entete_header %}
<script>window.CKEDITOR_BASEPATH = '/static/ckeditor/ckeditor/';</script>
<script src="/static/admin/js/vendor/jquery/jquery.js"></script>
<script src="/static/admin/js/jquery.init.js"></script>
<link href="/static/css/django_better_admin_arrayfield.min.css" type="text/css" media="all" rel="stylesheet">

View File

@ -3,6 +3,7 @@
{% block title %}Éditer {{ object.title }}{% endblock %}
{% block entete_header %}
<script>window.CKEDITOR_BASEPATH = '/static/ckeditor/ckeditor/';</script>
<script src="/static/admin/js/vendor/jquery/jquery.js"></script>
<script src="/static/admin/js/jquery.init.js"></script>
<link href="/static/css/django_better_admin_arrayfield.min.css" type="text/css" media="all" rel="stylesheet">

View File

@ -4,6 +4,7 @@
{% block entete_header %}
{% load static %}
<script>window.CKEDITOR_BASEPATH = '/static/ckeditor/ckeditor/';</script>
<script type="text/javascript" src="{% static "ckeditor/ckeditor-init.js" %}"></script>
<script type="text/javascript" src="{% static "ckeditor/ckeditor/ckeditor.js" %}"></script>
<script src="/static/admin/js/vendor/jquery/jquery.js"></script>

View File

@ -17,7 +17,7 @@ def run():
("Autre", "Autres événements", "A")
]
if len(Category.objects.all()) == 0:
if len(Category.objects.all()) <= 1:
print("On créée des catégories")
for c in categories:
cat = Category(name=c[0], alt_name = c[1] if c[1] is not None else c[0], codename=c[2])