erjemin/2021-cadpoint-ru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mod: upgrade deps and python 3.12

Browse Source
This commit is contained in:
Sergei Erjemin
2026-04-09 13:39:30 +03:00
parent aa15c09188
commit 8986592e55
7 changed files with 274 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cadpoint/cadpoint/settings.py
View File

@@ -55,6 +55,8 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
# Панель отладки показываем только в dev-окружении при `DEBUG=True`.
'debug_toolbar',
'easy_thumbnails',
'filer.apps.FilerConfig',
'mptt.apps.MpttConfig',
@@ -67,6 +69,8 @@ INSTALLED_APPS = [
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
# Middleware нужен, иначе панель debug toolbar просто не влезет в response.
'debug_toolbar.middleware.DebugToolbarMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
@@ -197,6 +201,8 @@ MEDIA_ROOT = PUBLIC_DIR.joinpath('media')
STATICFILES_DIRS = [PUBLIC_DIR.joinpath('static')]
STATIC_ROOT = PUBLIC_DIR.joinpath('staticfiles')
CSRF_TRUSTED_ORIGINS = env.list('DJANGO_CSRF_TRUSTED_ORIGINS', default=[])
# Внутренние адреса для debug toolbar: локальный браузер и loopback.
INTERNAL_IPS = env.list('DJANGO_INTERNAL_IPS', default=['127.0.0.1', '::1'])
# Настройки почтового сервера и базы данных читаются одинаково для всех окружений.
EMAIL_HOST = env('DJANGO_EMAIL_HOST', default='smtp.mail.ru') # SMTP server

47
cadpoint/cadpoint/urls.py
View File

@@ -15,35 +15,36 @@ Including another URLconf
"""
from django.contrib import admin
from django.conf.urls.static import static
from django.conf.urls import url
from django.urls import path, include
from django.urls import path, include, re_path
from cadpoint import settings
from web import views
urlpatterns = [
path(settings.ADMIN_URL, admin.site.urls),
url(r'^$', views.index),
url(r'^p(?P<ppage>\d*)$', views.index),
url(r'^tag_(?P<slug_tags>[^/]*)$', views.index),
url(r'^tag_(?P<slug_tags>[^/]*)[^/]*/p(?P<ppage>\d*)$', views.index),
re_path(r'^$', views.index),
re_path(r'^p(?P<ppage>\d*)$', views.index),
re_path(r'^tag_(?P<slug_tags>[^/]*)$', views.index),
re_path(r'^tag_(?P<slug_tags>[^/]*)[^/]*/p(?P<ppage>\d*)$', views.index),
# Статья
re_path(r'^item/(?P<content_id>\d*)-\S*$', views.show_item),
# После чистки кросс-ссылок в контенте legacy Joomla-редиректы временно
# отключаем, но код оставляем в файле как быстрый архивный reference.
# Если понадобится откат, достаточно раскомментировать блок ниже.
# re_path(r'^publication/32-hardware/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^publication/39-interview/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^news/3-newsflash/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^news/1-latest-news/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^runet-cad/37-runet-cad/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^section-blog/28-mcad/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^video/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^blogs/35-privat-blog/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^cad-company-feeds/40-cad-company-feeds/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^component/content/article/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^categoryblog/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^category-table/(?P<content_id>\d*)-\S*$', views.redirect_item),
# re_path(r'^aboutcadpoint.html/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^publication/32-hardware/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^publication/39-interview/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^news/3-newsflash/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^news/1-latest-news/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^runet-cad/37-runet-cad/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^section-blog/28-mcad/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^video/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^blogs/35-privat-blog/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^cad-company-feeds/40-cad-company-feeds/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^component/content/article/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^categoryblog/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^category-table/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^aboutcadpoint.html/(?P<content_id>\d*)-\S*$', views.redirect_item),
url(r'^item/(?P<content_id>\d*)-\S*$', views.show_item),
url(r'^sitemap.xml$', views.sitemap),
re_path(r'^sitemap.xml$', views.sitemap),
]