diff --git a/GeneralApp/migrations/0024_block_bg_video_url_en_block_bg_video_url_ru_and_more.py b/GeneralApp/migrations/0024_block_bg_video_url_en_block_bg_video_url_ru_and_more.py new file mode 100644 index 0000000..78c7052 --- /dev/null +++ b/GeneralApp/migrations/0024_block_bg_video_url_en_block_bg_video_url_ru_and_more.py @@ -0,0 +1,74 @@ +# Generated by Django 4.2.7 on 2023-12-19 00:32 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0023_alter_block_block_type'), + ] + + operations = [ + migrations.AddField( + model_name='block', + name='bg_video_url_en', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на фоновое видео'), + ), + migrations.AddField( + model_name='block', + name='bg_video_url_ru', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на фоновое видео'), + ), + migrations.AddField( + model_name='block', + name='video_url_en', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'), + ), + migrations.AddField( + model_name='block', + name='video_url_ru', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'), + ), + migrations.AddField( + model_name='widgetforblock', + name='video_url_en', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'), + ), + migrations.AddField( + model_name='widgetforblock', + name='video_url_ru', + field=models.TextField(blank=True, null=True, verbose_name='Ссылка на видео'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_en', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_ru', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_en', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), null=True, verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_ru', + field=models.TimeField(default=datetime.datetime(2023, 12, 19, 18, 0), null=True, verbose_name='Время работы до'), + ), + ] diff --git a/ServicesApp/models.py b/ServicesApp/models.py index 426ade7..b429138 100644 --- a/ServicesApp/models.py +++ b/ServicesApp/models.py @@ -96,6 +96,13 @@ class Service(BaseModelViewPage): null=True, blank=True ) + def get_subservices(self): + sub_services = Service.objects.filter( + enable=True, + parent_service=self + ).order_by('order') + return sub_services + class Meta: diff --git a/templates/blocks/b_services_3cols_w_groups.html b/templates/blocks/b_services_3cols_w_groups.html index 79e8162..869bd46 100644 --- a/templates/blocks/b_services_3cols_w_groups.html +++ b/templates/blocks/b_services_3cols_w_groups.html @@ -15,9 +15,9 @@ {{ service.name }}
- {% if service.rel_children_for_service.all %} + {% if service.get_subservices %}