create map

courses/migrations/0003_remove_course_mentors.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-12-05 11:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0002_auto_20171128_1518'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='course',
+            name='mentors',
+        ),
+    ]

courses/models.py

@@ -86,8 +86,6 @@ class Course(models.Model):
     slug = models.SlugField(max_length=255, blank=True, default='', unique=True, editable=False)
     direction = models.SmallIntegerField(choices=COURSE_DIRECTION, verbose_name='Направление', null=True)
     sort = models.SmallIntegerField(null=True, verbose_name="Порядок сортировки")
-    mentors = models.ManyToManyField(to=settings.AUTH_USER_MODEL, verbose_name='Кураторы', blank=True,
-                                     related_name='course_mentors')
     public = models.BooleanField(verbose_name='Опубликовать', default=False)
     title = models.CharField(verbose_name="Заголовок", max_length=255)
     description = models.TextField(verbose_name='Описание', blank=True)

courses/views.py

@@ -88,7 +88,9 @@ class VertexDetail(APIView):
             if progress.exists():
                 res['next'] = MiniVertexSerializer(vertex.get_next(progress[0].get_template())).data
                 res['is_in_progress'] = vertex in progress[0].get_objects_in_progress()
+            else:
+                res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data
         except Thread.DoesNotExist or Vertex.DoesNotExist:
-            pass
+            res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data
 
         return Response(res, status=200) if status == 200 else Response(status=204)

journals/views.py

@@ -81,7 +81,7 @@ def get_pay_stat(request, pk):
             i.content_object.course.title,
             i.content_object.vertex_set.all()[0].title,
             i.content_object.id,
-            i.date.date()
+            i.date,
         ])
 
     return response