diff --git a/BaseModels/base_models.py b/BaseModels/base_models.py index 5ef46b8..2f69bfd 100644 --- a/BaseModels/base_models.py +++ b/BaseModels/base_models.py @@ -156,7 +156,8 @@ class BaseModelViewPage(BaseModel): return None def get_slides(self): - return self.slides.filter(enable=True).order_by('order') + slides = self.slides.filter(enable=True).order_by('order') + return slides def get_FAQ_items(self): return self.FAQ_items.filter(enable=True).order_by('order') diff --git a/GeneralApp/migrations/0025_block_url_en_block_url_ru_widgetforblock_url_en_and_more.py b/GeneralApp/migrations/0025_block_url_en_block_url_ru_widgetforblock_url_en_and_more.py new file mode 100644 index 0000000..6a352aa --- /dev/null +++ b/GeneralApp/migrations/0025_block_url_en_block_url_ru_widgetforblock_url_en_and_more.py @@ -0,0 +1,64 @@ +# Generated by Django 4.2.7 on 2023-12-22 14:31 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0024_block_bg_video_url_en_block_bg_video_url_ru_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='block', + name='url_en', + field=models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы'), + ), + migrations.AddField( + model_name='block', + name='url_ru', + field=models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы'), + ), + migrations.AddField( + model_name='widgetforblock', + name='url_en', + field=models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы'), + ), + migrations.AddField( + model_name='widgetforblock', + name='url_ru', + field=models.TextField(blank=True, null=True, verbose_name='URL привязанной страницы'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 9, 0), verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_en', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_from_ru', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 9, 0), null=True, verbose_name='Время работы с'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 18, 0), verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_en', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 18, 0), null=True, verbose_name='Время работы до'), + ), + migrations.AlterField( + model_name='office', + name='work_time_to_ru', + field=models.TimeField(default=datetime.datetime(2023, 12, 22, 18, 0), null=True, verbose_name='Время работы до'), + ), + ] diff --git a/GeneralApp/translation.py b/GeneralApp/translation.py index 7824d8d..c3501cb 100644 --- a/GeneralApp/translation.py +++ b/GeneralApp/translation.py @@ -27,7 +27,7 @@ translator.register(Contact, Contact_TranslationOptions) class Block_TranslationOptions(TranslationOptions): fields = ( 'name', 'description', 'text', 'title', 'FAQ_title', 'but_title', - 'video_url', 'bg_video_url' + 'video_url', 'bg_video_url', 'url' ) translator.register(Block, Block_TranslationOptions) @@ -42,7 +42,7 @@ translator.register(Option, Option_TranslationOptions) class WidgetForBlock_TranslationOptions(TranslationOptions): fields = ( 'name', 'description', 'title', 'but_title', 'text', - 'video_url', + 'video_url', 'url' ) translator.register(WidgetForBlock, WidgetForBlock_TranslationOptions) diff --git a/SlidesApp/admin.py b/SlidesApp/admin.py index fc76bc7..39d74ae 100644 --- a/SlidesApp/admin.py +++ b/SlidesApp/admin.py @@ -30,3 +30,49 @@ class Admin_StackedInline_Slide(Admin_Trans_GenericBaseIconStackedInline): }) ] + + +# class Admin_Slide(SuperModelAdmin, Admin_Trans_BaseModelViewPage): +# +# +# fieldsets = [ +# (None, { +# 'classes': ['wide'], +# 'fields': ( +# 'section', 'parent_service', +# 'name', +# 'url', +# # 'title', +# 'description', 'text', +# 'picture', +# 'order', +# ) +# }), +# +# ] +# +# +# list_display = [ +# 'image_thumb', +# 'id', +# 'content_type', 'content_object', +# 'name', 'url', +# 'enable', +# # 'title', +# 'order', 'modifiedDT', 'createDT' +# ] +# +# ordering = ['order'] +# +# prepopulated_fields = {"url": ("name_en",)} +# +# list_display_links = ['id', 'name', 'image_thumb'] +# list_editable = ['order', 'enable'] +# +# list_filter = ['modifiedDT', 'createDT', ] +# search_fields = ['name', 'title'] +# # filter_horizontal = ['options'] +# +# +# +# admin.site.register(Slide, Admin_Slide) \ No newline at end of file