BIG UPD: migrate to python 3.10 and django 3.2
All checks were successful
buildbot/tox Build done.

This commit is contained in:
2022-06-07 16:07:08 +02:00
parent edd4050935
commit 8610e2a557
36 changed files with 192 additions and 91 deletions

View File

@@ -0,0 +1,30 @@
# Generated by Django 3.2.13 on 2022-06-07 11:45
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('dav_events', '0042_auto_20220607_1345'),
('dav_registration', '0010_registration_apply_reduced_fee'),
]
operations = [
migrations.AlterField(
model_name='registration',
name='event',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='registrations', to='dav_events.event'),
),
migrations.AlterField(
model_name='registration',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='registrationstatus',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
]

View File

@@ -6,7 +6,6 @@ from django.core.exceptions import ValidationError
from django.db import models
from django.urls import reverse
from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from dav_base.validators import DAVNumberValidator
@@ -19,9 +18,8 @@ logger = logging.getLogger(__name__)
midnight = datetime.time(00, 00, 00)
@python_2_unicode_compatible
class Registration(models.Model):
event = models.ForeignKey(Event, related_name='registrations')
event = models.ForeignKey(Event, related_name='registrations', on_delete=models.PROTECT)
created_at = models.DateTimeField(auto_now_add=True)
personal_names = models.CharField(max_length=1024,
@@ -219,11 +217,11 @@ Anmerkung:
return timezone.make_aware(datetime.datetime.combine(purge_date, midnight))
@python_2_unicode_compatible
class RegistrationStatus(models.Model):
registration = models.OneToOneField(Registration, on_delete=models.CASCADE, related_name='status')
updated_at = models.DateTimeField(auto_now=True)
answered = models.BooleanField(_('Durch Tourleitung beantwortet'), default=False)
# TODO: NullBooleanField is marked deprecated
accepted = models.NullBooleanField(_('Zusage erteilt'))
class Meta:

View File

@@ -2,6 +2,8 @@ from django.conf.urls import url
from . import views
app_name = 'dav_registration'
urlpatterns = [
url(r'^$', views.RootView.as_view(), name='root'),
url(r'^finished', views.RegistrationSuccessView.as_view(), name='registered'),