Merge remote-tracking branch 'origin/dev' into dev

api/v1/serializers/course.py

@@ -138,7 +138,7 @@ class CourseCreateSerializer(DispatchContentMixin,
         materials = validated_data.pop('materials', [])
         gallery = validated_data.pop('gallery', {})
         author = validated_data.get('author', None)
-        if not author:
+        if not instance.author or not author:
             validated_data['author'] = self.context['request'].user
         course = super().update(instance, validated_data)
         self.dispatch_materials(course, materials)

apps/course/migrations/0032_auto_20180214_1336.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.0.2 on 2018-02-14 13:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course', '0031_auto_20180213_0906'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='short_description',
+            field=models.TextField(db_index=True, default='', verbose_name='Краткое описание курса'),
+        ),
+        migrations.AlterField(
+            model_name='course',
+            name='status',
+            field=models.PositiveSmallIntegerField(choices=[(0, 'Draft'), (1, 'Pending'), (2, 'Published'), (3, 'Archived'), (4, 'Denied')], default=0, verbose_name='Статус'),
+        ),
+        migrations.AlterField(
+            model_name='course',
+            name='title',
+            field=models.CharField(db_index=True, default='', max_length=100, verbose_name='Название курса'),
+        ),
+    ]

apps/course/models.py

@@ -45,10 +45,11 @@ class Course(BaseModel, DeactivatedMixin):
         max_length=100, unique=True, db_index=True,
     )
     author = models.ForeignKey(
-        User, on_delete=models.SET_NULL, null=True, blank=True)
-    title = models.CharField('Название курса', max_length=100, db_index=True)
+        User, on_delete=models.SET_NULL, null=True, blank=True
+    )
+    title = models.CharField('Название курса', default='', max_length=100, db_index=True)
     short_description = models.TextField(
-        'Краткое описание курса', db_index=True
+        'Краткое описание курса', default='', db_index=True
     )
     from_author = models.TextField(
         'От автора', default='', null=True, blank=True