From d06f2355dec604c0de923bd4bf5edcea52de3483 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Thu, 23 Feb 2017 21:51:36 +0100 Subject: [PATCH] add video fields on event model, fix #82 --- .../migrations/0024_auto_20170222_1629.py | 25 +++++++++++++++++++ src/program/models.py | 12 +++++++++ .../migrations/0035_auto_20170222_1629.py | 20 +++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 src/program/migrations/0024_auto_20170222_1629.py create mode 100644 src/shop/migrations/0035_auto_20170222_1629.py diff --git a/src/program/migrations/0024_auto_20170222_1629.py b/src/program/migrations/0024_auto_20170222_1629.py new file mode 100644 index 00000000..cf412a37 --- /dev/null +++ b/src/program/migrations/0024_auto_20170222_1629.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-22 15:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0023_auto_20170218_1243'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='video_recording', + field=models.BooleanField(default=True, help_text='Whether the event will be video recorded.'), + ), + migrations.AddField( + model_name='event', + name='video_url', + field=models.URLField(blank=True, help_text='URL to the recording.', max_length=1000, null=True), + ), + ] diff --git a/src/program/models.py b/src/program/models.py index f842960a..700ca2cb 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -2,6 +2,7 @@ from django.contrib.postgres.fields import DateTimeRangeField from django.db import models from django.utils.text import slugify from django.conf import settings +from django.utils.translation import ugettext_lazy as _ from utils.models import CreatedUpdatedModel from django.core.exceptions import ValidationError from datetime import timedelta @@ -41,6 +42,17 @@ class Event(CreatedUpdatedModel): event_type = models.ForeignKey(EventType) camp = models.ForeignKey('camps.Camp', null=True, related_name="events") + video_url = models.URLField( + max_length=1000, + null=True, + blank=True, + help_text=_('URL to the recording.') + ) + video_recording = models.BooleanField( + default=True, + help_text=_('Whether the event will be video recorded or not.') + ) + class Meta: ordering = ['title'] unique_together = (('camp', 'slug'), ('camp', 'title')) diff --git a/src/shop/migrations/0035_auto_20170222_1629.py b/src/shop/migrations/0035_auto_20170222_1629.py new file mode 100644 index 00000000..8e28746a --- /dev/null +++ b/src/shop/migrations/0035_auto_20170222_1629.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-22 15:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shop', '0034_auto_20170131_1849'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='customer_comment', + field=models.TextField(blank=True, default='', help_text='If you have any comments about the order please enter them here.', verbose_name='Customer comment'), + ), + ]