Merge pull request #61 from faulteh/lca2017

Increase slot name since it's made up of room names and our room name…
This commit is contained in:
Scott Bragg 2016-11-13 15:32:55 +11:00 committed by GitHub
commit b4356a1551
2 changed files with 21 additions and 1 deletions

View file

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-11-13 04:30
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('symposion_schedule', '0002_presentation_unpublish'),
]
operations = [
migrations.AlterField(
model_name='slot',
name='name',
field=models.CharField(editable=False, max_length=150),
),
]

View file

@ -82,7 +82,7 @@ class SlotKind(models.Model):
@python_2_unicode_compatible @python_2_unicode_compatible
class Slot(models.Model): class Slot(models.Model):
name = models.CharField(max_length=100, editable=False) name = models.CharField(max_length=150, editable=False)
day = models.ForeignKey(Day, verbose_name=_("Day")) day = models.ForeignKey(Day, verbose_name=_("Day"))
kind = models.ForeignKey(SlotKind, verbose_name=_("Kind")) kind = models.ForeignKey(SlotKind, verbose_name=_("Kind"))
start = models.TimeField(verbose_name=_("Start")) start = models.TimeField(verbose_name=_("Start"))