From 85d6267dfe491ca0f1d93892298d91dd8553edd1 Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 9 Dec 2023 21:16:07 +0300 Subject: [PATCH] 0.3.5 contacts page --- GeneralApp/admin.py | 11 ++++++++--- GeneralApp/views.py | 29 +++++++++++++++++------------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index f3555b0..5de6ee1 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -90,6 +90,7 @@ class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperI # class Admin_StaticPage(NestedModelAdmin, Admin_Trans_BaseModelViewPage): class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): + from ServicesApp.admin import Admin_StackedInline_BlockPluginPresentation fieldsets = [ @@ -120,20 +121,24 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): 'order', 'modifiedDT', 'createDT' ] - list_display_links = ['id'] + list_display_links = ['id', 'image_thumb', 'name'] list_editable = ['order'] list_filter = ['modifiedDT', 'createDT'] search_fields = ['name', 'title'] # filter_horizontal = ['options'] - inlines = [Admin_StackedInline_Block] + inlines = [ + Admin_StackedInline_BlockPluginPresentation, + Admin_StackedInline_Block, + AdminStacked_FAQitem, + ] def has_delete_permission(self, request, obj=None): if request.user.is_superuser: return True - if obj.url in ('main', 'spec_technics', 'works'): + if obj.url in ('main', 'contacts'): return False admin.site.register(StaticPage,Admin_StaticPage) diff --git a/GeneralApp/views.py b/GeneralApp/views.py index 971220a..21ac062 100644 --- a/GeneralApp/views.py +++ b/GeneralApp/views.py @@ -29,6 +29,14 @@ def MainPage(request): name_ru = _('Главная') ) + try: + page = StaticPage.objects.get(url='contacts') + except StaticPage.DoesNotExist: + page = StaticPage.objects.create( + url='contacts', + name_ru = _('Контакты') + ) + # from ArticlesApp.models import ArticleModel # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] @@ -56,18 +64,7 @@ def StaticPageView(request, url): if url == '': return MainPage(request) - elif url == 'for_movers': - Dict.update({ - # 'route_form': RouteForm(), - 'owner_type': 'customer', - }) - elif url == 'for_customers': - Dict.update({ - # 'route_form': RouteForm(), - 'owner_type': 'mover' - }) - # elif url == 'works': - # return WorksPage(request) + elif url in ['main']: raise Http404 @@ -95,8 +92,16 @@ def StaticPageView(request, url): def contacts_view(request): # from RoutesApp.forms import RouteForm # from SubscribesApp.funcs import get_subsribes_w_options + try: + page = StaticPage.objects.get(url='contacts') + except Exception as e: + page = StaticPage.objects.create( + url='contacts', + name_ru=_('Контакты') + ) Dict = { + 'page': page, 'offices': Office.objects.filter(enable=True) }