Commit d1325947 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'migration/event_cancel_deadline' into 'master'

New migration for events model, added a deadline for cancelling your registration.

Also fixed a small typo in events model.

See merge request !69
parents 59c3be40 f9b2552f
# -*- coding: utf-8 -*-
# Generated by Django 1.10 on 2016-08-31 19:39
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('events', '0003_remove_event_registration_required'),
]
operations = [
migrations.AddField(
model_name='event',
name='cancel_deadline',
field=models.DateTimeField(blank=True, null=True, verbose_name='cancel deadline'),
),
]
......@@ -37,6 +37,12 @@ class Event(models.Model):
blank=True
)
cancel_deadline = models.DateTimeField(
_("cancel deadline"),
null=True,
blank=True
)
location = models.CharField(_("location"), max_length=255)
map_location = models.CharField(
......@@ -156,7 +162,7 @@ class RegistrationInformationField(models.Model):
value_set = self.textregistrationinformation_set
elif self.type == 'checkbox':
value_set = self.booleanregistrationinformation_set
elif value_set == 'intfield':
elif self.type == 'intfield':
value_set = self.integerregistrationinformation_set
try:
return value_set.get(registration=registration).value
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment