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

moved CHOICE_FIELD_MAX_LENGTH from models to choices.

Browse Source
This commit is contained in:
heinzel
2018-01-25 13:24:46 +01:00
parent 88596ea1b5
commit 9e2c128321
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dav_events/choices.py
View File

@@ -2,6 +2,8 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django_countries import Countries from django_countries import Countries
CHOICE_FIELD_MAX_LENGTH = 25
class ChoiceSet(object): class ChoiceSet(object):
def __init__(self, choices): def __init__(self, choices):

18
dav_events/models.py
View File

@@ -19,8 +19,6 @@ from . import emails
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
CHOICE_FIELD_MAX_LENGTH = 25
def get_ghost_user(): def get_ghost_user():
return get_user_model().objects.get_or_create(username='-deleted-')[0] return get_user_model().objects.get_or_create(username='-deleted-')[0]
@@ -52,12 +50,12 @@ class Event(models.Model):
description = models.TextField() description = models.TextField()
# ModeForm # ModeForm
mode = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, mode = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.MODE_CHOICES) choices=choices.MODE_CHOICES)
sport = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, sport = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.SPORT_CHOICES) choices=choices.SPORT_CHOICES)
ski_lift = models.BooleanField(default=False) ski_lift = models.BooleanField(default=False)
level = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, level = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.LEVEL_CHOICES) choices=choices.LEVEL_CHOICES)
first_day = models.DateField() first_day = models.DateField()
alt_first_day = models.DateField(blank=True, alt_first_day = models.DateField(blank=True,
@@ -83,16 +81,16 @@ class Event(models.Model):
# LocationForm # LocationForm
country = CountryField() country = CountryField()
terrain = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, terrain = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.TERRAIN_CHOICES) choices=choices.TERRAIN_CHOICES)
location = models.CharField(max_length=config.LOCATION_MAX_LENGTH) location = models.CharField(max_length=config.LOCATION_MAX_LENGTH)
# ApproachForm # ApproachForm
transport = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, transport = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.TRANSPORT_CHOICES) choices=choices.TRANSPORT_CHOICES)
transport_other = models.CharField(max_length=config.TRANSPORT_OTHER_MAX_LENGTH, transport_other = models.CharField(max_length=config.TRANSPORT_OTHER_MAX_LENGTH,
blank=True) blank=True)
meeting_point = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, meeting_point = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.MEETING_POINT_CHOICES) choices=choices.MEETING_POINT_CHOICES)
meeting_point_other = models.CharField(max_length=config.MEETING_POINT_OTHER_MAX_LENGTH, meeting_point_other = models.CharField(max_length=config.MEETING_POINT_OTHER_MAX_LENGTH,
blank=True) blank=True)
@@ -105,11 +103,11 @@ class Event(models.Model):
basecamp = models.CharField(max_length=config.BASECAMP_MAX_LENGTH, basecamp = models.CharField(max_length=config.BASECAMP_MAX_LENGTH,
blank=True) blank=True)
accommodation = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, accommodation = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.ACCOMMODATION_CHOICES) choices=choices.ACCOMMODATION_CHOICES)
accommodation_other = models.CharField(max_length=config.ACCOMMODATION_OTHER_MAX_LENGTH, accommodation_other = models.CharField(max_length=config.ACCOMMODATION_OTHER_MAX_LENGTH,
blank=True) blank=True)
meals = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, meals = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.MEALS_CHOICES) choices=choices.MEALS_CHOICES)
meals_other = models.CharField(max_length=config.MEALS_OTHER_MAX_LENGTH, meals_other = models.CharField(max_length=config.MEALS_OTHER_MAX_LENGTH,
blank=True) blank=True)