UPD: dav_events: renamed utils method to roles.

This commit is contained in:
2019-06-05 12:07:21 +02:00
parent 4c67995680
commit abb013cadc
12 changed files with 15 additions and 29 deletions

View File

@@ -79,7 +79,7 @@ class Migration(migrations.Migration):
('trainer_3_phone', models.CharField(blank=True, max_length=250)),
('charge', models.FloatField(default=0)),
('additional_costs', models.CharField(blank=True, max_length=250)),
('owner', models.ForeignKey(null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='events', to=settings.AUTH_USER_MODEL)),
('owner', models.ForeignKey(null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='events', to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ['first_day'],

View File

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='accepted_by',
field=models.ForeignKey(null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='event',

View File

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='event',
name='accepted_by',
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='event',

View File

@@ -28,6 +28,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='published_by',
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
),
]

View File

@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='event',
name='accepted_by',
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Freigegeben durch'),
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Freigegeben durch'),
),
migrations.AlterField(
model_name='event',
@@ -239,7 +239,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='event',
name='owner',
field=models.ForeignKey(null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='events', to=settings.AUTH_USER_MODEL, verbose_name='Ersteller'),
field=models.ForeignKey(null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='events', to=settings.AUTH_USER_MODEL, verbose_name='Ersteller'),
),
migrations.AlterField(
model_name='event',
@@ -269,7 +269,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='event',
name='publication_confirmed_by',
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Ver\xf6ffentlichung best\xe4tigt durch'),
field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Ver\xf6ffentlichung best\xe4tigt durch'),
),
migrations.AlterField(
model_name='event',

View File

@@ -2,12 +2,10 @@
# Generated by Django 1.11.11 on 2018-07-04 12:02
from __future__ import unicode_literals
import dav_events.models.event
import dav_events.utils
import dav_events.models
from django.conf import settings
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
@@ -47,11 +45,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='eventflag',
name='status',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dav_events.EventStatus'),
field=models.ForeignKey(on_delete=models.deletion.PROTECT, related_name='+', to='dav_events.EventStatus'),
),
migrations.AddField(
model_name='eventflag',
name='user',
field=models.ForeignKey(default=dav_events.models.eventflag.get_system_user_id, on_delete=models.SET(dav_events.utils.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(default=dav_events.models.eventflag.get_system_user_id, on_delete=models.SET(dav_events.models.get_ghost_user), related_name='+', to=settings.AUTH_USER_MODEL),
),
]