Merge branch 'gzbender' into 'master'

LIL-529 Не всегда редактируется созданные уроки в лагере

See merge request lilcity/backend!53

apps/school/migrations/0017_auto_20180628_2000.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2018-06-28 20:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('school', '0016_auto_20180429_0818'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='livelesson',
+            name='short_description',
+            field=models.TextField(blank=True, default='', verbose_name='Краткое описание урока'),
+        ),
+    ]

apps/school/models.py

@@ -93,7 +93,7 @@ class SchoolScheduleImage(models.Model):
 
 class LiveLesson(BaseModel, DeactivatedMixin):
     title = models.CharField('Название урока', max_length=100)
-    short_description = models.TextField('Краткое описание урока')
+    short_description = models.TextField('Краткое описание урока', default='', blank=True)
     stream = models.URLField('Ссылка на VIMEO', default='', blank=True)
     date = models.DateField(default=now, unique=True)
     cover = models.ForeignKey(