diff --git a/BaseModels/base_models.py b/BaseModels/base_models.py index 4f31d06..788ccce 100644 --- a/BaseModels/base_models.py +++ b/BaseModels/base_models.py @@ -143,9 +143,17 @@ class BaseModelViewPage(BaseModel): blocks = GenericRelation('GeneralApp.Block', related_query_name='grel_%(class)s_for_block_item') + slides = GenericRelation('SlidesApp.Slide', related_query_name='grel_%(class)s_for_block_item') + class Meta: abstract = True + def get_slides(self): + return self.slides.filter(enable=True).order_by('order') + + def get_FAQ_items(self): + return self.FAQ_items.filter(enable=True).order_by('order') + def get_blocks(self): return self.blocks.filter(enable=True).order_by('order') diff --git a/ServicesApp/admin.py b/ServicesApp/admin.py index 7848ecb..7c44214 100644 --- a/ServicesApp/admin.py +++ b/ServicesApp/admin.py @@ -6,6 +6,7 @@ from django.forms import widgets from super_inlines.admin import SuperInlineModelAdmin, SuperModelAdmin from GeneralApp.admin import Admin_StackedInline_Block from SlidesApp.admin import Admin_StackedInline_Slide +from django.utils.translation import gettext as _ def sets_for_formfield_for_dbfield(field, db_field): if db_field.name == 'url' or db_field.name == 'name' or db_field.name == 'title' or db_field.name == 'name_plural': @@ -57,6 +58,12 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage): 'order', ) }), + (_('Дополнительно'), { + 'classes': ['wide', 'collapse'], + 'fields': ( + 'FAQ_title', + ) + }), ('SEO', { 'classes': ['wide', 'collapse'], 'fields': ( @@ -86,7 +93,8 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage): inlines = [ Admin_StackedInline_Slide, Admin_StackedInline_BlockPluginPresentation, - Admin_StackedInline_Block + Admin_StackedInline_Block, + AdminStacked_FAQitem, ] def has_delete_permission(self, request, obj=None): diff --git a/ServicesApp/funcs.py b/ServicesApp/funcs.py index 87aec1c..06887a9 100644 --- a/ServicesApp/funcs.py +++ b/ServicesApp/funcs.py @@ -1,4 +1,5 @@ from .models import * +from django.utils.translation import gettext as _ def get_sections(): diff --git a/templates/blocks/b_faq.html b/templates/blocks/b_faq.html index 0434642..56304b3 100644 --- a/templates/blocks/b_faq.html +++ b/templates/blocks/b_faq.html @@ -1,25 +1,30 @@ {% load static %} {% load i18n %} -