Merge branch 'current_branch' into 'dev'

migrate update

See merge request !82

courses/migrations/0004_auto_20180222_1756.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-02-22 17:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0003_auto_20180219_1323'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lesson',
+            name='sort',
+            field=models.SmallIntegerField(verbose_name='Поле сортировки'),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='sort',
+            field=models.SmallIntegerField(verbose_name='Поле сортировки'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='lesson',
+            unique_together=set([('sort', 'topic')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='topic',
+            unique_together=set([('sort', 'course')]),
+        ),
+    ]

courses/models.py

@@ -39,7 +39,7 @@ class Lesson(models.Model):
         verbose_name='Материалы курса',
     )
     free = models.BooleanField(default=False, verbose_name='Привилегии для узла не будут проверяться')
-    sort = models.SmallIntegerField(unique=True)
+    sort = models.SmallIntegerField(verbose_name='Поле сортировки')
 
     is_hm = models.BooleanField(default=False) #TODO костыли
     old_id = models.IntegerField(null=True, blank=True)
@@ -51,6 +51,7 @@ class Lesson(models.Model):
         verbose_name = "Урок"
         verbose_name_plural = "Уроки"
         ordering = ('sort', )
+        unique_together = ('sort', 'topic')
 
 
 class Topic(models.Model):
@@ -58,12 +59,13 @@ class Topic(models.Model):
     title = models.CharField(verbose_name='Название', max_length=255)
     description = models.TextField(verbose_name='Описание', blank=True, null=True)
     icon = models.ImageField(verbose_name='Иконка темы', null=True, blank=True)
-    sort = models.SmallIntegerField(unique=True)
+    sort = models.SmallIntegerField(verbose_name='Поле сортировки')
 
     class Meta:
         verbose_name = "Тема"
         verbose_name_plural = "Темы"
         ordering = ('sort',)
+        unique_together = ('sort', 'course')
 
 
 class CourseManager(models.Manager):