diff --git a/blog/comments/migrations/0002_alter_commentauthor_unique_together.py b/blog/comments/migrations/0002_alter_commentauthor_unique_together.py new file mode 100644 index 0000000..63189a7 --- /dev/null +++ b/blog/comments/migrations/0002_alter_commentauthor_unique_together.py @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 0000000..ffdd2a6 --- /dev/null +++ b/blog/comments/migrations/0003_comment_nickname_alter_comment_author.py @@ -0,0 +1,25 @@ +# 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/0004_image.py b/blog/posts/migrations/0004_image.py new file mode 100644 index 0000000..08f2a4a --- /dev/null +++ b/blog/posts/migrations/0004_image.py @@ -0,0 +1,26 @@ +# 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 new file mode 100644 index 0000000..e242e73 --- /dev/null +++ b/blog/posts/migrations/0005_remove_image_file_path_remove_image_name_image_slug.py @@ -0,0 +1,26 @@ +# 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), + ), + ] diff --git a/blog/posts/models.py b/blog/posts/models.py index d2810c6..3e0ca6e 100644 --- a/blog/posts/models.py +++ b/blog/posts/models.py @@ -13,10 +13,10 @@ class Post(models.Model): def __str__(self): return self.title - def save(self, *args, **kwargs): - self.text = re.sub(r"(\n.+?\n)", r"

\1

", self.text) - self.text = re.sub(r"(\*(.+?)\*)", r"\2", self.text) - super(Post, self).save(*args, **kwargs) + # def save(self, *args, **kwargs): + # self.text = re.sub(r"(\n.+?\n)", r"

\1

", self.text) + # self.text = re.sub(r"(\*(.+?)\*)", r"\2", self.text) + # super(Post, self).save(*args, **kwargs) class Meta: verbose_name = "Статья"