From abb013cadc4963e2de2bef27396240dbb7a620a9 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Wed, 5 Jun 2019 12:07:21 +0200 Subject: [PATCH] UPD: dav_events: renamed utils method to roles. --- dav_events/migrations/0001_initial.py | 2 +- dav_events/migrations/0002_auto_20180124_1514.py | 2 +- dav_events/migrations/0004_auto_20180124_1650.py | 2 +- dav_events/migrations/0013_auto_20180224_1401.py | 2 +- dav_events/migrations/0019_auto_20180306_2101.py | 6 +++--- dav_events/migrations/0020_auto_20180704_1202.py | 8 +++----- dav_events/models/__init__.py | 1 + dav_events/models/event.py | 2 +- dav_events/models/eventflag.py | 2 +- dav_events/{utils.py => roles.py} | 13 ------------- dav_events/views/events.py | 2 +- dav_events/workflow.py | 2 +- 12 files changed, 15 insertions(+), 29 deletions(-) rename dav_events/{utils.py => roles.py} (85%) diff --git a/dav_events/migrations/0001_initial.py b/dav_events/migrations/0001_initial.py index fcb13f1..212c5f5 100644 --- a/dav_events/migrations/0001_initial.py +++ b/dav_events/migrations/0001_initial.py @@ -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'], diff --git a/dav_events/migrations/0002_auto_20180124_1514.py b/dav_events/migrations/0002_auto_20180124_1514.py index b1cd6b3..721c3bb 100644 --- a/dav_events/migrations/0002_auto_20180124_1514.py +++ b/dav_events/migrations/0002_auto_20180124_1514.py @@ -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', diff --git a/dav_events/migrations/0004_auto_20180124_1650.py b/dav_events/migrations/0004_auto_20180124_1650.py index 0c60eea..be18d0b 100644 --- a/dav_events/migrations/0004_auto_20180124_1650.py +++ b/dav_events/migrations/0004_auto_20180124_1650.py @@ -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', diff --git a/dav_events/migrations/0013_auto_20180224_1401.py b/dav_events/migrations/0013_auto_20180224_1401.py index 11bedd3..0701453 100644 --- a/dav_events/migrations/0013_auto_20180224_1401.py +++ b/dav_events/migrations/0013_auto_20180224_1401.py @@ -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), ), ] diff --git a/dav_events/migrations/0019_auto_20180306_2101.py b/dav_events/migrations/0019_auto_20180306_2101.py index c0893fb..20a178e 100644 --- a/dav_events/migrations/0019_auto_20180306_2101.py +++ b/dav_events/migrations/0019_auto_20180306_2101.py @@ -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', diff --git a/dav_events/migrations/0020_auto_20180704_1202.py b/dav_events/migrations/0020_auto_20180704_1202.py index f6e15cc..e29dc7b 100644 --- a/dav_events/migrations/0020_auto_20180704_1202.py +++ b/dav_events/migrations/0020_auto_20180704_1202.py @@ -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), ), ] diff --git a/dav_events/models/__init__.py b/dav_events/models/__init__.py index 9645797..dbddae6 100644 --- a/dav_events/models/__init__.py +++ b/dav_events/models/__init__.py @@ -1,3 +1,4 @@ +from ..roles import get_system_user, get_ghost_user from .event import Event from .eventflag import EventFlag from .eventstatus import EventStatus diff --git a/dav_events/models/event.py b/dav_events/models/event.py index b59bdd6..22e6c15 100644 --- a/dav_events/models/event.py +++ b/dav_events/models/event.py @@ -16,10 +16,10 @@ from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import get_language, ugettext_lazy as _ from django_countries.fields import CountryField +from . import get_ghost_user from .. import choices from .. import config from .. import signals -from ..utils import get_ghost_user from ..workflow import DefaultWorkflow diff --git a/dav_events/models/eventflag.py b/dav_events/models/eventflag.py index a00a115..bbb842a 100644 --- a/dav_events/models/eventflag.py +++ b/dav_events/models/eventflag.py @@ -4,7 +4,7 @@ from django.db import models from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible -from ..utils import get_ghost_user, get_system_user +from . import get_ghost_user, get_system_user def get_system_user_id(): diff --git a/dav_events/utils.py b/dav_events/roles.py similarity index 85% rename from dav_events/utils.py rename to dav_events/roles.py index 6f072f4..2bc616c 100644 --- a/dav_events/utils.py +++ b/dav_events/roles.py @@ -2,24 +2,11 @@ import logging from django.apps import apps from django.contrib.auth import get_user_model from django.contrib.auth.models import Group -from django.utils import timezone - -# from .models import Participant app_config = apps.get_containing_app_config(__package__) logger = logging.getLogger(__name__) -# def purge_participants(): -# now = timezone.now() -# for p in Participant.objects.filter(purge_at__lte=now): -# logger.info('Purge participant \'%s\'', p) -# p.delete() - - -# TODO: most of the functions here are auth stuff. - - def get_system_user(): return get_user_model().objects.get_or_create(username='-system-')[0] diff --git a/dav_events/views/events.py b/dav_events/views/events.py index c19309b..6750473 100644 --- a/dav_events/views/events.py +++ b/dav_events/views/events.py @@ -20,7 +20,7 @@ from .. import choices from .. import emails from .. import forms from .. import models -from ..utils import get_users_by_role, has_role +from ..roles import get_users_by_role, has_role from ..workflow import DefaultWorkflow logger = logging.getLogger(__name__) diff --git a/dav_events/workflow.py b/dav_events/workflow.py index 11f684c..b723454 100644 --- a/dav_events/workflow.py +++ b/dav_events/workflow.py @@ -11,7 +11,7 @@ from . import emails from . import signals from .models.eventflag import EventFlag from .models.eventstatus import get_or_create_event_status -from .utils import get_users_by_role, has_role +from .roles import get_users_by_role, has_role logger = logging.getLogger(__name__) today = datetime.date.today()