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

apps/course/migrations/0021_auto_20180205_1559.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.0.2 on 2018-02-05 15:59
+
+from django.db import migrations
+from django.contrib.contenttypes.models import ContentType
+
+
+def fwrd_func(apps, schema_editor):
+    CourseComment = apps.get_model('course', 'CourseComment')
+    LessonComment = apps.get_model('course', 'LessonComment')
+    db_alias = schema_editor.connection.alias
+    if CourseComment.objects.exists():
+        coursecomment_content_type = ContentType.objects.get(
+            app_label='course', model='coursecomment',
+        )
+        CourseComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=coursecomment_content_type,
+        )
+    if LessonComment.objects.exists():
+        lessoncomment_content_type = ContentType.objects.get(
+            app_label='course', model='lessoncomment',
+        )
+        LessonComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=lessoncomment_content_type,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course', '0020_auto_20180202_1716'),
+    ]
+
+    operations = [
+        migrations.RunPython(fwrd_func)
+    ]

apps/course/migrations/0022_auto_20180205_1615.py

@@ -0,0 +1,35 @@
+# Generated by Django 2.0.2 on 2018-02-05 16:15
+
+from django.db import migrations
+from django.contrib.contenttypes.models import ContentType
+
+
+def fwrd_func(apps, schema_editor):
+    CourseComment = apps.get_model('course', 'CourseComment')
+    LessonComment = apps.get_model('course', 'LessonComment')
+    db_alias = schema_editor.connection.alias
+    if CourseComment.objects.using(db_alias).all().exists():
+        coursecomment_content_type = ContentType.objects.get(
+            app_label='course', model='coursecomment',
+        )
+        CourseComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=coursecomment_content_type,
+        )
+    if LessonComment.objects.using(db_alias).all().exists():
+        lessoncomment_content_type = ContentType.objects.get(
+            app_label='course', model='lessoncomment',
+        )
+        LessonComment.objects.using(db_alias).all().update(
+            polymorphic_ctype=lessoncomment_content_type,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course', '0021_auto_20180205_1559'),
+    ]
+
+    operations = [
+        migrations.RunPython(fwrd_func)
+    ]