From ba1d796e88147f835493ea73773ed20b6f95ff91 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 28 Nov 2023 16:25:01 +0300 Subject: [PATCH] 0.0.24 services services_view_scheme --- GeneralApp/admin.py | 1 + ServicesApp/admin.py | 1 + ServicesApp/views.py | 6 ++++++ templates/blocks/b_how_with_us_working.html | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index f90c0c0..c54f79d 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -93,6 +93,7 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): list_display = [ + 'image_thumb', 'id', 'name', 'url', # 'title', diff --git a/ServicesApp/admin.py b/ServicesApp/admin.py index d0dea4e..af095f2 100644 --- a/ServicesApp/admin.py +++ b/ServicesApp/admin.py @@ -67,6 +67,7 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage): list_display = [ + 'image_thumb', 'id', 'name', 'url', # 'title', diff --git a/ServicesApp/views.py b/ServicesApp/views.py index aa44a23..0aebb36 100644 --- a/ServicesApp/views.py +++ b/ServicesApp/views.py @@ -16,10 +16,16 @@ def section_view(request, url): # from ArticlesApp.models import ArticleModel # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] services = section.rel_services_for_section.filter(enable=True).order_by('order') + services_view_scheme = '2_cols_wo_group' + for service in services: + if service.rel_children_for_service.filter(enable=True): + services_view_scheme = '3_cols_w_group' + break Dict = { 'page': section, 'services': services, + 'services_view_scheme': services_view_scheme # 'articles': arts, } diff --git a/templates/blocks/b_how_with_us_working.html b/templates/blocks/b_how_with_us_working.html index 4737fbf..7de5965 100644 --- a/templates/blocks/b_how_with_us_working.html +++ b/templates/blocks/b_how_with_us_working.html @@ -4,7 +4,7 @@
- {{ block.title }} + {{ block.name }}
{% if block.rel_widgets_for_block.all %}