From 13476f71127df5785d208a943db0d16f2023aa20 Mon Sep 17 00:00:00 2001 From: Marat Date: Sun, 18 Feb 2018 16:17:02 +0000 Subject: [PATCH 1/2] Update Envoy.blade.php --- Envoy.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Envoy.blade.php b/Envoy.blade.php index 5ac8684..04fd919 100644 --- a/Envoy.blade.php +++ b/Envoy.blade.php @@ -39,7 +39,7 @@ echo '>> Создание симлинков' echo '>> Запускаем тесты' @if ($branch) cd {{ $new_release_dir }} - source /www/servers/python-server/bin/activate && python manage.py test + source /www/servers/python-server/bin/activate && python manage.py migrate && python manage.py test @endif @endtask From c9d77117998175324905aec5d16fba93e499d751 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 18 Feb 2018 19:17:16 +0300 Subject: [PATCH 2/2] migrate update --- courses/migrations/0002_auto_20180218_1910.py | 19 +++++++++++++++++++ courses/models.py | 1 + 2 files changed, 20 insertions(+) create mode 100644 courses/migrations/0002_auto_20180218_1910.py diff --git a/courses/migrations/0002_auto_20180218_1910.py b/courses/migrations/0002_auto_20180218_1910.py new file mode 100644 index 0000000..adb7d2e --- /dev/null +++ b/courses/migrations/0002_auto_20180218_1910.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2018-02-18 19:10 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='topic', + options={'ordering': ('sort',), 'verbose_name': 'Тема', 'verbose_name_plural': 'Темы'}, + ), + ] diff --git a/courses/models.py b/courses/models.py index c45ee96..7d52c36 100755 --- a/courses/models.py +++ b/courses/models.py @@ -63,6 +63,7 @@ class Topic(models.Model): class Meta: verbose_name = "Тема" verbose_name_plural = "Темы" + ordering = ('sort',) class CourseManager(models.Manager):