From 9e2c128321ea3c3ade57ff0ad689be87441b735e Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Thu, 25 Jan 2018 13:24:46 +0100 Subject: [PATCH] moved CHOICE_FIELD_MAX_LENGTH from models to choices. --- dav_events/choices.py | 2 ++ dav_events/models.py | 18 ++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dav_events/choices.py b/dav_events/choices.py index 125c7e1..fc56ab0 100644 --- a/dav_events/choices.py +++ b/dav_events/choices.py @@ -2,6 +2,8 @@ from django.utils.translation import ugettext_lazy as _ from django_countries import Countries +CHOICE_FIELD_MAX_LENGTH = 25 + class ChoiceSet(object): def __init__(self, choices): diff --git a/dav_events/models.py b/dav_events/models.py index 3e2280c..176839e 100644 --- a/dav_events/models.py +++ b/dav_events/models.py @@ -19,8 +19,6 @@ from . import emails logger = logging.getLogger(__name__) -CHOICE_FIELD_MAX_LENGTH = 25 - def get_ghost_user(): return get_user_model().objects.get_or_create(username='-deleted-')[0] @@ -52,12 +50,12 @@ class Event(models.Model): description = models.TextField() # ModeForm - mode = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, + mode = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH, 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) 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) first_day = models.DateField() alt_first_day = models.DateField(blank=True, @@ -83,16 +81,16 @@ class Event(models.Model): # LocationForm 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) location = models.CharField(max_length=config.LOCATION_MAX_LENGTH) # ApproachForm - transport = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH, + transport = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH, choices=choices.TRANSPORT_CHOICES) transport_other = models.CharField(max_length=config.TRANSPORT_OTHER_MAX_LENGTH, 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) meeting_point_other = models.CharField(max_length=config.MEETING_POINT_OTHER_MAX_LENGTH, blank=True) @@ -105,11 +103,11 @@ class Event(models.Model): basecamp = models.CharField(max_length=config.BASECAMP_MAX_LENGTH, 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) accommodation_other = models.CharField(max_length=config.ACCOMMODATION_OTHER_MAX_LENGTH, 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) meals_other = models.CharField(max_length=config.MEALS_OTHER_MAX_LENGTH, blank=True)