DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

UPD: dav_events: renamed utils method to roles.

Browse Source
This commit is contained in:
heinzel
2019-06-05 12:07:21 +02:00
parent 4c67995680
commit abb013cadc
12 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dav_events/migrations/0001_initial.py
View File

@@ -79,7 +79,7 @@ class Migration(migrations.Migration):
('trainer_3_phone', models.CharField(blank=True, max_length=250)), ('trainer_3_phone', models.CharField(blank=True, max_length=250)),
('charge', models.FloatField(default=0)), ('charge', models.FloatField(default=0)),
('additional_costs', models.CharField(blank=True, max_length=250)), ('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={ options={
'ordering': ['first_day'], 'ordering': ['first_day'],

2
dav_events/migrations/0002_auto_20180124_1514.py
View File

@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='event', model_name='event',
name='accepted_by', 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( migrations.AddField(
model_name='event', model_name='event',

2
dav_events/migrations/0004_auto_20180124_1650.py
View File

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='event', model_name='event',
name='accepted_by', 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( migrations.AlterField(
model_name='event', model_name='event',

2
dav_events/migrations/0013_auto_20180224_1401.py
View File

@@ -28,6 +28,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='event', model_name='event',
name='published_by', 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),
), ),
] ]

6
dav_events/migrations/0019_auto_20180306_2101.py
View File

@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='event', model_name='event',
name='accepted_by', 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( migrations.AlterField(
model_name='event', model_name='event',
@@ -239,7 +239,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='event', model_name='event',
name='owner', 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( migrations.AlterField(
model_name='event', model_name='event',
@@ -269,7 +269,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='event', model_name='event',
name='publication_confirmed_by', 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( migrations.AlterField(
model_name='event', model_name='event',

8
dav_events/migrations/0020_auto_20180704_1202.py
View File

@@ -2,12 +2,10 @@
# Generated by Django 1.11.11 on 2018-07-04 12:02 # Generated by Django 1.11.11 on 2018-07-04 12:02
from __future__ import unicode_literals from __future__ import unicode_literals
import dav_events.models.event import dav_events.models
import dav_events.utils
from django.conf import settings from django.conf import settings
import django.core.validators import django.core.validators
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone import django.utils.timezone
@@ -47,11 +45,11 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='eventflag', model_name='eventflag',
name='status', 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( migrations.AddField(
model_name='eventflag', model_name='eventflag',
name='user', 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),
), ),
] ]

1
dav_events/models/__init__.py
View File

@@ -1,3 +1,4 @@
from ..roles import get_system_user, get_ghost_user
from .event import Event from .event import Event
from .eventflag import EventFlag from .eventflag import EventFlag
from .eventstatus import EventStatus from .eventstatus import EventStatus

2
dav_events/models/event.py
View File

@@ -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.utils.translation import get_language, ugettext_lazy as _
from django_countries.fields import CountryField from django_countries.fields import CountryField
from . import get_ghost_user
from .. import choices from .. import choices
from .. import config from .. import config
from .. import signals from .. import signals
from ..utils import get_ghost_user
from ..workflow import DefaultWorkflow from ..workflow import DefaultWorkflow

2
dav_events/models/eventflag.py
View File

@@ -4,7 +4,7 @@ from django.db import models
from django.utils import timezone from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible 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(): def get_system_user_id():

13
dav_events/utils.py → dav_events/roles.py
View File

@@ -2,24 +2,11 @@ import logging
from django.apps import apps from django.apps import apps
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.utils import timezone
# from .models import Participant
app_config = apps.get_containing_app_config(__package__) app_config = apps.get_containing_app_config(__package__)
logger = logging.getLogger(__name__) 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(): def get_system_user():
return get_user_model().objects.get_or_create(username='-system-')[0] return get_user_model().objects.get_or_create(username='-system-')[0]

2
dav_events/views/events.py
View File

@@ -20,7 +20,7 @@ from .. import choices
from .. import emails from .. import emails
from .. import forms from .. import forms
from .. import models 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 from ..workflow import DefaultWorkflow
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
dav_events/workflow.py
View File

@@ -11,7 +11,7 @@ from . import emails
from . import signals from . import signals
from .models.eventflag import EventFlag from .models.eventflag import EventFlag
from .models.eventstatus import get_or_create_event_status 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__) logger = logging.getLogger(__name__)
today = datetime.date.today() today = datetime.date.today()