From 0181688bf705dbde1bba5d242527c96466ce7f60 Mon Sep 17 00:00:00 2001 From: Alexander Zolotarev Date: Thu, 10 Aug 2017 09:16:34 +0300 Subject: [PATCH] fix migration --- access/migrations/0089_auto_20170810_0904.py | 21 ++++++++++ courses/migrations/0045_auto_20170810_0904.py | 22 +++++++++++ courses/migrations/0046_auto_20170711_1704.py | 38 ------------------- .../0047_remove_course_public_old.py | 19 ---------- fabfile.py | 4 +- finance/migrations/0071_bill_flow.py | 22 +++++++++++ .../migrations/0072_auto_20170810_0904.py | 20 ++++++++++ 7 files changed, 87 insertions(+), 59 deletions(-) create mode 100644 access/migrations/0089_auto_20170810_0904.py create mode 100644 courses/migrations/0045_auto_20170810_0904.py delete mode 100644 courses/migrations/0046_auto_20170711_1704.py delete mode 100644 courses/migrations/0047_remove_course_public_old.py create mode 100644 finance/migrations/0071_bill_flow.py create mode 100644 journals/migrations/0072_auto_20170810_0904.py diff --git a/access/migrations/0089_auto_20170810_0904.py b/access/migrations/0089_auto_20170810_0904.py new file mode 100644 index 0000000..e8358fd --- /dev/null +++ b/access/migrations/0089_auto_20170810_0904.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-08-10 09:04 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0088_auto_20170123_1947'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2017, 8, 10, 9, 4, 29, 732661), null=True, verbose_name='Задержка до. Не включая этот день.'), + ), + ] diff --git a/courses/migrations/0045_auto_20170810_0904.py b/courses/migrations/0045_auto_20170810_0904.py new file mode 100644 index 0000000..4f300cd --- /dev/null +++ b/courses/migrations/0045_auto_20170810_0904.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-08-10 09:04 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0044_auto_20170621_1548'), + ] + + operations = [ + migrations.AlterField( + model_name='lesson', + name='on_comment', + field=models.CharField(choices=[('N', 'Включены'), ('F', 'Отключены'), ('T', 'Подчиняется теме')], default='T', help_text='https://go.skillbox.ru/management/faq/37', max_length=1, verbose_name='Блок комментариев'), + ), + ] diff --git a/courses/migrations/0046_auto_20170711_1704.py b/courses/migrations/0046_auto_20170711_1704.py deleted file mode 100644 index 7ad4302..0000000 --- a/courses/migrations/0046_auto_20170711_1704.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.3 on 2017-07-11 17:04 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0045_merge'), - ] - - operations = [ - migrations.CreateModel( - name='Flow', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255, verbose_name='Название')), - ('description', models.TextField(blank=True, default='', null=True, verbose_name='Описание')), - ('start_flow', models.DateTimeField(default=datetime.datetime.now, verbose_name='Дата начала потока')), - ('created', models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='Создан')), - ('modified', models.DateTimeField(auto_now=True, verbose_name='Изменен')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Курс')), - ], - options={ - 'ordering': ['-modified'], - 'verbose_name_plural': 'Потоки', - 'verbose_name': 'Поток', - }, - ), - migrations.RemoveField( - model_name='coursetheme', - name='empty_old', - ), - ] diff --git a/courses/migrations/0047_remove_course_public_old.py b/courses/migrations/0047_remove_course_public_old.py deleted file mode 100644 index ae4455c..0000000 --- a/courses/migrations/0047_remove_course_public_old.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.3 on 2017-07-11 17:09 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0046_auto_20170711_1704'), - ] - - operations = [ - migrations.RemoveField( - model_name='course', - name='public_old', - ), - ] diff --git a/fabfile.py b/fabfile.py index ce2b7ed..ff94072 100644 --- a/fabfile.py +++ b/fabfile.py @@ -296,8 +296,8 @@ def create(): with virtualenv(): #manage('migrate --run-syncdb --noinput') #manage('migrate --list') - #manage("migrate --noinput") - manage("collectstatic -v 0 --noinput") + manage("migrate --noinput") + manage("collectstatic -l --noinput") #if exists('%sgunicorn.pid'): # sudo("kill -HUP 'cat %sgunicorn.pid'" % env.project_path) diff --git a/finance/migrations/0071_bill_flow.py b/finance/migrations/0071_bill_flow.py new file mode 100644 index 0000000..0732ea7 --- /dev/null +++ b/finance/migrations/0071_bill_flow.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-08-10 09:04 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0045_auto_20170810_0904'), + ('finance', '0070_auto_20170424_1638'), + ] + + operations = [ + migrations.AddField( + model_name='bill', + name='flow', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='courses.Flow', verbose_name='Поток'), + ), + ] diff --git a/journals/migrations/0072_auto_20170810_0904.py b/journals/migrations/0072_auto_20170810_0904.py new file mode 100644 index 0000000..89e6f56 --- /dev/null +++ b/journals/migrations/0072_auto_20170810_0904.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-08-10 09:04 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('journals', '0071_auto_20161202_0338'), + ] + + operations = [ + migrations.AlterField( + model_name='homeworkj', + name='date', + field=models.DateTimeField(blank=True, null=True, verbose_name='Дата предоставления доступа'), + ), + ]