From e9a26db2554a68a5400174791e7f3a559c0e8bae Mon Sep 17 00:00:00 2001 From: SDE Date: Sun, 11 Feb 2024 21:21:03 +0300 Subject: [PATCH 1/4] 0.4.67 connect ya counter --- GeneralApp/models.py | 1 + templates/promo/i_counters.html | 17 +++++++++++++++++ templates/tb_base.html | 1 + 3 files changed, 19 insertions(+) create mode 100644 templates/promo/i_counters.html diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 01eb505..a74ecb6 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -138,6 +138,7 @@ class Option(BaseModel): verbose_name = _('Параметр') verbose_name_plural = _('Параметры') + class FAQitem(BaseModel): content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True) diff --git a/templates/promo/i_counters.html b/templates/promo/i_counters.html new file mode 100644 index 0000000..4b0f9f7 --- /dev/null +++ b/templates/promo/i_counters.html @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html index 615aa33..0c1dac9 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -36,5 +36,6 @@ {% include 'blocks/b_footer.html' %} + {% include 'promo/i_counters.html' %} \ No newline at end of file From fa39b43d9045bda0778c82cb008c99cde25a3d13 Mon Sep 17 00:00:00 2001 From: SDE Date: Sun, 11 Feb 2024 21:24:13 +0300 Subject: [PATCH 2/4] 0.4.68 connect webmasters --- templates/tb_base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/tb_base.html b/templates/tb_base.html index 0c1dac9..622950b 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -17,6 +17,8 @@ + + From 03d5790374da1fda5d3d4865d7598dc6dbf9c9ed Mon Sep 17 00:00:00 2001 From: SDE Date: Wed, 14 Feb 2024 15:24:42 +0300 Subject: [PATCH 3/4] 0.4.69 send_mail fix --- BaseModels/mailSender.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseModels/mailSender.py b/BaseModels/mailSender.py index 176f6a7..c62b64b 100644 --- a/BaseModels/mailSender.py +++ b/BaseModels/mailSender.py @@ -145,8 +145,8 @@ def send_mail_by_SMTPlib(sets, subject, from_email, to_init, html_content, smtp_ res = None if type(to) in (list, tuple): - if sets['sender_email'] in to: - to.remove(sets['sender_email']) + # if sets['sender_email'] in to: + # to.remove(sets['sender_email']) if len(to) > 1: to_str = u', '.join(to) From 6894471ba185a9411886d3773dca1aff2ef25bd2 Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 26 Apr 2024 14:23:05 +0300 Subject: [PATCH 4/4] 0.4.70 fix admin --- GeneralApp/admin.py | 4 ++-- PortfolioApp/admin.py | 2 +- ServicesApp/admin.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 9862f97..74e105a 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -136,7 +136,7 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): if request.user.is_superuser: return True - if obj.url in ('main', 'contacts'): + if not obj or obj.url in ['main', 'contacts']: return False admin.site.register(StaticPage,Admin_StaticPage) @@ -191,7 +191,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage): if request.user.is_superuser: return True - if obj.name in ('About US', 'machines', 'works'): + if not obj or obj.url in ['main', 'contacts']: return False def has_add_permission(self, request): diff --git a/PortfolioApp/admin.py b/PortfolioApp/admin.py index 341ccba..7734edb 100644 --- a/PortfolioApp/admin.py +++ b/PortfolioApp/admin.py @@ -79,7 +79,7 @@ class Admin_Project(SuperModelAdmin, Admin_Trans_BaseModelViewPage): if request.user.is_superuser: return True - if obj.url in ('main', 'spec_technics', 'works'): + if not obj or obj.url in ['main', 'contacts']: return False admin.site.register(Project, Admin_Project) \ No newline at end of file diff --git a/ServicesApp/admin.py b/ServicesApp/admin.py index adc5293..2b82907 100644 --- a/ServicesApp/admin.py +++ b/ServicesApp/admin.py @@ -101,7 +101,7 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage): if request.user.is_superuser: return True - if obj.url in ('main', 'spec_technics', 'works'): + if not obj or obj.url in ['main', 'contacts']: return False admin.site.register(Section,Admin_Section) @@ -158,7 +158,7 @@ class Admin_Service(SuperModelAdmin, Admin_Trans_BaseModelViewPage): if request.user.is_superuser: return True - if obj.url in ('main', 'spec_technics', 'works'): + if not obj or obj.url in ['main', 'contacts']: return False admin.site.register(Service, Admin_Service)