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

Fixed optional fields to enable editing within admin interface.

Browse Source
This commit is contained in:
heinzel
2018-01-24 18:00:18 +01:00
parent 9889b53963
commit 60fb3e6519
2 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dav_events/models.py
View File

@@ -34,8 +34,10 @@ class Event(models.Model):
related_name='events')
created_at = models.DateTimeField(auto_now_add=True)
accepted = models.BooleanField(default=False)
accepted_at = models.DateTimeField(null=True)
accepted_at = models.DateTimeField(blank=True,
null=True)
accepted_by = models.ForeignKey(settings.AUTH_USER_MODEL,
blank=True,
null=True,
on_delete=models.SET(get_ghost_user),
related_name='+')
@@ -56,9 +58,12 @@ class Event(models.Model):
level = models.CharField(max_length=CHOICE_FIELD_MAX_LENGTH,
choices=choices.LEVEL_CHOICES)
first_day = models.DateField()
alt_first_day = models.DateField(null=True)
last_day = models.DateField(null=True)
alt_last_day = models.DateField(null=True)
alt_first_day = models.DateField(blank=True,
null=True)
last_day = models.DateField(blank=True,
null=True)
alt_last_day = models.DateField(blank=True,
null=True)
# TrainingForm
course_topic_1 = models.TextField(blank=True)
@@ -89,9 +94,11 @@ class Event(models.Model):
choices=choices.MEETING_POINT_CHOICES)
meeting_point_other = models.CharField(max_length=config.MEETING_POINT_OTHER_MAX_LENGTH,
blank=True)
meeting_time = models.TimeField(null=True)
meeting_time = models.TimeField(blank=True,
null=True)
arrival_previous_day = models.BooleanField(default=False)
return_time = models.TimeField(null=True)
return_time = models.TimeField(blank=True,
null=True)
basecamp = models.CharField(max_length=config.BASECAMP_MAX_LENGTH,
blank=True)
@@ -108,13 +115,16 @@ class Event(models.Model):
# RequirementsForm
requirements = models.TextField(blank=True)
equipment = models.TextField(blank=True)
pre_meeting_1 = models.DateTimeField(null=True)
pre_meeting_2 = models.DateTimeField(null=True)
pre_meeting_1 = models.DateTimeField(blank=True,
null=True)
pre_meeting_2 = models.DateTimeField(blank=True,
null=True)
# RegistrationForm
min_participants = models.IntegerField(default=0)
max_participants = models.IntegerField(default=0)
deadline = models.DateField(null=True)
deadline = models.DateField(blank=True,
null=True)
# TrainerForm
trainer_firstname = models.CharField(max_length=config.TRAINER_NAME_MAX_LENGTH,