sysadminix/Aerbim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2024-07-10 14:15:13 +03:00
parent 626543523b 6894471ba1
commit d437f34dcd
7 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseModels/mailSender.py
View File

@@ -145,8 +145,8 @@ def send_mail_by_SMTPlib(sets, subject, from_email, to_init, html_content, smtp_
res = None res = None
if type(to) in (list, tuple): if type(to) in (list, tuple):
if sets['sender_email'] in to: # if sets['sender_email'] in to:
to.remove(sets['sender_email']) # to.remove(sets['sender_email'])
if len(to) > 1: if len(to) > 1:
to_str = u', '.join(to) to_str = u', '.join(to)

4
GeneralApp/admin.py
View File

@@ -136,7 +136,7 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
if request.user.is_superuser: if request.user.is_superuser:
return True return True
if obj.url in ('main', 'contacts'): if not obj or obj.url in ['main', 'contacts']:
return False return False
admin.site.register(StaticPage,Admin_StaticPage) admin.site.register(StaticPage,Admin_StaticPage)
@@ -191,7 +191,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage):
if request.user.is_superuser: if request.user.is_superuser:
return True return True
if obj.name in ('About US', 'machines', 'works'): if not obj or obj.url in ['main', 'contacts']:
return False return False
def has_add_permission(self, request): def has_add_permission(self, request):

1
GeneralApp/models.py
View File

@@ -138,6 +138,7 @@ class Option(BaseModel):
verbose_name = _('Параметр') verbose_name = _('Параметр')
verbose_name_plural = _('Параметры') verbose_name_plural = _('Параметры')
class FAQitem(BaseModel): class FAQitem(BaseModel):
content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True) content_type = models.ForeignKey(ContentType, on_delete=models.SET_NULL, null=True)

2
PortfolioApp/admin.py
View File

@@ -79,7 +79,7 @@ class Admin_Project(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
if request.user.is_superuser: if request.user.is_superuser:
return True return True
if obj.url in ('main', 'spec_technics', 'works'): if not obj or obj.url in ['main', 'contacts']:
return False return False
admin.site.register(Project, Admin_Project) admin.site.register(Project, Admin_Project)

4
ServicesApp/admin.py
View File

@@ -101,7 +101,7 @@ class Admin_Section(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
if request.user.is_superuser: if request.user.is_superuser:
return True return True
if obj.url in ('main', 'spec_technics', 'works'): if not obj or obj.url in ['main', 'contacts']:
return False return False
admin.site.register(Section,Admin_Section) admin.site.register(Section,Admin_Section)
@@ -158,7 +158,7 @@ class Admin_Service(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
if request.user.is_superuser: if request.user.is_superuser:
return True return True
if obj.url in ('main', 'spec_technics', 'works'): if not obj or obj.url in ['main', 'contacts']:
return False return False
admin.site.register(Service, Admin_Service) admin.site.register(Service, Admin_Service)

17
templates/promo/i_counters.html Normal file
View File

@@ -0,0 +1,17 @@
<!-- Yandex.Metrika counter -->
<script type="text/javascript" >
(function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
m[i].l=1*new Date();
for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
ym(96435081, "init", {
clickmap:true,
trackLinks:true,
accurateTrackBounce:true,
webvisor:true
});
</script>
<noscript><div><img src="https://mc.yandex.ru/watch/96435081" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
<!-- /Yandex.Metrika counter -->

3
templates/tb_base.html
View File

@@ -17,6 +17,8 @@
<meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">
<link rel="icon" href="/favicon.svg"> <link rel="icon" href="/favicon.svg">
<meta name="yandex-verification" content="4dfc4f1266cf62fc" />
<meta name="google-site-verification" content="DxHi3ArQL9qucqeSeiFe84ZhctCiVkoXAFxr7M62y98" />
</head> </head>
<body> <body>
@@ -54,5 +56,6 @@
{% include 'blocks/b_footer.html' %} {% include 'blocks/b_footer.html' %}
{% include 'promo/i_counters.html' %}
</body> </body>
</html> </html>