diff --git a/blog/comments/migrations/0001_initial.py b/blog/comments/migrations/0001_initial.py index c8ed12b..77eedd7 100644 --- a/blog/comments/migrations/0001_initial.py +++ b/blog/comments/migrations/0001_initial.py @@ -1,5 +1,6 @@ -# Generated by Django 4.0.3 on 2022-04-12 13:43 +# Generated by Django 4.0.3 on 2022-04-26 13:48 +import comments.models from django.db import migrations, models import django.db.models.deletion import django.utils.timezone @@ -10,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('posts', '0003_alter_post_options'), + ('posts', '0001_initial'), ] operations = [ @@ -22,16 +23,17 @@ class Migration(migrations.Migration): ('author_secret_hash', models.CharField(blank=True, max_length=256, null=True, verbose_name='Хеш секрета')), ], options={ - 'unique_together': {('author_name', 'author_secret_hash')}, + 'unique_together': {('author_name',)}, }, ), migrations.CreateModel( name='Comment', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nickname', models.CharField(blank=True, max_length=60, null=True, verbose_name='имя автора')), ('comment_text', models.TextField()), ('date', models.DateTimeField(default=django.utils.timezone.now)), - ('author', models.ForeignKey(default='аноним', on_delete=django.db.models.deletion.CASCADE, to='comments.commentauthor')), + ('author', models.ForeignKey(default=comments.models.get_anonym_id, on_delete=django.db.models.deletion.CASCADE, to='comments.commentauthor')), ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='posts.post')), ('reply', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='comments.comment')), ], diff --git a/blog/comments/migrations/0002_alter_commentauthor_unique_together.py b/blog/comments/migrations/0002_alter_commentauthor_unique_together.py deleted file mode 100644 index 63189a7..0000000 --- a/blog/comments/migrations/0002_alter_commentauthor_unique_together.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-12 14:20 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('comments', '0001_initial'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='commentauthor', - unique_together={('author_name',)}, - ), - ] diff --git a/blog/comments/migrations/0003_comment_nickname_alter_comment_author.py b/blog/comments/migrations/0003_comment_nickname_alter_comment_author.py deleted file mode 100644 index ffdd2a6..0000000 --- a/blog/comments/migrations/0003_comment_nickname_alter_comment_author.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-12 14:45 - -import comments.models -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('comments', '0002_alter_commentauthor_unique_together'), - ] - - operations = [ - migrations.AddField( - model_name='comment', - name='nickname', - field=models.CharField(blank=True, max_length=60, null=True, verbose_name='имя автора'), - ), - migrations.AlterField( - model_name='comment', - name='author', - field=models.ForeignKey(default=comments.models.get_anonym_id, on_delete=django.db.models.deletion.CASCADE, to='comments.commentauthor'), - ), - ] diff --git a/blog/posts/migrations/0001_initial.py b/blog/posts/migrations/0001_initial.py index 6ace5fa..feef59d 100644 --- a/blog/posts/migrations/0001_initial.py +++ b/blog/posts/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 4.0.3 on 2022-03-30 14:07 +# Generated by Django 4.0.3 on 2022-04-26 13:48 from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone class Migration(migrations.Migration): @@ -17,6 +19,21 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('title', models.CharField(max_length=250)), ('text', models.TextField()), + ('pub_date', models.DateTimeField(verbose_name='date published')), + ], + options={ + 'verbose_name': 'Статья', + 'verbose_name_plural': 'Статьи', + }, + ), + migrations.CreateModel( + name='Image', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('slug', models.CharField(blank=True, max_length=250, null=True)), + ('image', models.ImageField(upload_to='')), + ('upload_date', models.DateTimeField(default=django.utils.timezone.now)), + ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='posts.post')), ], ), ] diff --git a/blog/posts/migrations/0002_post_pub_date.py b/blog/posts/migrations/0002_post_pub_date.py deleted file mode 100644 index 75f44ed..0000000 --- a/blog/posts/migrations/0002_post_pub_date.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0.3 on 2022-03-30 14:32 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('posts', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='post', - name='pub_date', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='date published'), - preserve_default=False, - ), - ] diff --git a/blog/posts/migrations/0003_alter_post_options.py b/blog/posts/migrations/0003_alter_post_options.py deleted file mode 100644 index e331424..0000000 --- a/blog/posts/migrations/0003_alter_post_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-01 14:57 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('posts', '0002_post_pub_date'), - ] - - operations = [ - migrations.AlterModelOptions( - name='post', - options={'verbose_name': 'Статья', 'verbose_name_plural': 'Статьи'}, - ), - ] diff --git a/blog/posts/migrations/0004_image.py b/blog/posts/migrations/0004_image.py deleted file mode 100644 index 08f2a4a..0000000 --- a/blog/posts/migrations/0004_image.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-16 12:27 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('posts', '0003_alter_post_options'), - ] - - operations = [ - migrations.CreateModel( - name='Image', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=250)), - ('file_path', models.CharField(max_length=250)), - ('image', models.ImageField(upload_to='')), - ('upload_date', models.DateTimeField(default=django.utils.timezone.now)), - ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='posts.post')), - ], - ), - ] diff --git a/blog/posts/migrations/0005_remove_image_file_path_remove_image_name_image_slug.py b/blog/posts/migrations/0005_remove_image_file_path_remove_image_name_image_slug.py deleted file mode 100644 index e242e73..0000000 --- a/blog/posts/migrations/0005_remove_image_file_path_remove_image_name_image_slug.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-16 13:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('posts', '0004_image'), - ] - - operations = [ - migrations.RemoveField( - model_name='image', - name='file_path', - ), - migrations.RemoveField( - model_name='image', - name='name', - ), - migrations.AddField( - model_name='image', - name='slug', - field=models.CharField(blank=True, max_length=250, null=True), - ), - ]