diff --git a/GeneralApp/migrations/0007_alter_mediaitem_picture_alter_mediaitem_video.py b/GeneralApp/migrations/0007_alter_mediaitem_picture_alter_mediaitem_video.py new file mode 100644 index 0000000..260bf8f --- /dev/null +++ b/GeneralApp/migrations/0007_alter_mediaitem_picture_alter_mediaitem_video.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.2 on 2024-11-15 15:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0006_mediaitem'), + ] + + operations = [ + migrations.AlterField( + model_name='mediaitem', + name='picture', + field=models.ImageField(blank=True, null=True, upload_to='uploads/', verbose_name='Фото'), + ), + migrations.AlterField( + model_name='mediaitem', + name='video', + field=models.FileField(blank=True, null=True, upload_to='uploads/video/', verbose_name='Видео'), + ), + ] diff --git a/GeneralApp/migrations/0008_alter_mediaitem_picture_alter_mediaitem_video.py b/GeneralApp/migrations/0008_alter_mediaitem_picture_alter_mediaitem_video.py new file mode 100644 index 0000000..a125376 --- /dev/null +++ b/GeneralApp/migrations/0008_alter_mediaitem_picture_alter_mediaitem_video.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.2 on 2024-11-15 15:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0007_alter_mediaitem_picture_alter_mediaitem_video'), + ] + + operations = [ + migrations.AlterField( + model_name='mediaitem', + name='picture', + field=models.ImageField(blank=True, null=True, upload_to='media_items/photo/', verbose_name='Фото'), + ), + migrations.AlterField( + model_name='mediaitem', + name='video', + field=models.FileField(blank=True, null=True, upload_to='media_items/video/', verbose_name='Видео'), + ), + ] diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 4ffa47c..15ee8a6 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -13,8 +13,8 @@ class MediaItem(BaseModel): object_id = models.PositiveIntegerField() content_object = GenericForeignKey('content_type', 'object_id') - picture = models.ImageField(upload_to='media/', verbose_name=_('Фото'), null=True, blank=True) - video = models.FileField(upload_to='media/video/', verbose_name=_('Видео'), null=True, blank=True) + picture = models.ImageField(upload_to='media_items/photo/', verbose_name=_('Фото'), null=True, blank=True) + video = models.FileField(upload_to='media_items/video/', verbose_name=_('Видео'), null=True, blank=True) comment = models.TextField(verbose_name=_('Комментарий'), null=True, blank=True) diff --git a/templates/pages/p_customer_landing_page.html b/templates/pages/p_customer_landing_page.html index d17acdf..2bec917 100644 --- a/templates/pages/p_customer_landing_page.html +++ b/templates/pages/p_customer_landing_page.html @@ -132,14 +132,14 @@
{% translate "Что о нас говорят люди" %}
- + {% for media_item in page.get_media_items %}
- - - + + +
{% endfor %}