diff --git a/barsys/forms.py b/barsys/forms.py index 2593505..ff6c7e5 100644 --- a/barsys/forms.py +++ b/barsys/forms.py @@ -4,7 +4,7 @@ from crispy_forms.helper import FormHelper from django import forms from django.contrib.auth import forms as auth_forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import * from pybarsys.settings import PybarsysPreferences @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs): ) self.helper = FormHelper() - self.helper.template = "bootstrap/table_inline_formset.html" + self.helper.template = "bootstrap3/table_inline_formset.html" self.helper.form_tag = False diff --git a/barsys/templates/barsys/admin/base.html b/barsys/templates/barsys/admin/base.html index f3d28c6..f0c8ca4 100644 --- a/barsys/templates/barsys/admin/base.html +++ b/barsys/templates/barsys/admin/base.html @@ -1,7 +1,7 @@ {% extends 'bootstrap3/bootstrap3.html' %} {% load bootstrap3 %} -{% load staticfiles %} +{% load static %} {% block bootstrap3_title %}Barsys management{% endblock %} {% block bootstrap3_extra_head %} {% endblock %} diff --git a/barsys/urls.py b/barsys/urls.py index 086f6f7..4add104 100644 --- a/barsys/urls.py +++ b/barsys/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path as url from . import views diff --git a/pybarsys/settings.py b/pybarsys/settings.py index cf4f663..dfd15dc 100644 --- a/pybarsys/settings.py +++ b/pybarsys/settings.py @@ -26,11 +26,11 @@ "barsys.apps.BarsysConfig", "django_filters", "crispy_forms", + "crispy_bootstrap3", "rest_framework", ] MIDDLEWARE = [ - "debug_toolbar.middleware.DebugToolbarMiddleware", "django.middleware.security.SecurityMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", @@ -63,6 +63,8 @@ DATABASES = {"default": env.db()} +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # keep 32-bit PKs; avoids migrations on existing tables + AUTH_USER_MODEL = "barsys.User" # custom Barsys user model # Password validation @@ -111,12 +113,10 @@ TEMPLATES[0]["OPTIONS"]["string_if_invalid"] = "!INVALID!" if env.bool("SHOW_DEBUG_TOOLBAR", default=False): INSTALLED_APPS.append("debug_toolbar") + MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware") DEBUG_TOOLBAR_CONFIG = { "SHOW_TOOLBAR_CALLBACK": lambda e: True, - "DISABLE_PANELS": { - "debug_toolbar.panels.redirects.RedirectsPanel", - "debug_toolbar.panels.templates.TemplatesPanel", - }, + "DISABLE_PANELS": set(), } DEBUG_TOOLBAR_PANELS = [ @@ -131,7 +131,7 @@ "debug_toolbar.panels.cache.CachePanel", "debug_toolbar.panels.signals.SignalsPanel", "debug_toolbar.panels.logging.LoggingPanel", - "debug_toolbar.panels.redirects.RedirectsPanel", + "debug_toolbar.panels.history.HistoryPanel", "debug_toolbar.panels.profiling.ProfilingPanel", ] diff --git a/pybarsys/urls.py b/pybarsys/urls.py index b5a32f9..05a7d00 100644 --- a/pybarsys/urls.py +++ b/pybarsys/urls.py @@ -15,7 +15,7 @@ """ from django.conf import settings -from django.conf.urls import include, url +from django.urls import include, re_path as url from django.contrib.auth import views as auth_views from barsys.forms import LoginForm @@ -39,7 +39,7 @@ ), ] -if settings.DEBUG: +if "debug_toolbar" in settings.INSTALLED_APPS: import debug_toolbar urlpatterns = [ diff --git a/requirements.txt b/requirements.txt index 39c5bf8..20e3231 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,10 @@ -Django~=2.2.0 -django-bootstrap3~=21.2 -django-crispy-forms~=1.7.2 -django-debug-toolbar~=1.11 -django-filter~=21.1 -djangorestframework~=3.11.2 -django-environ~=0.4.5 -babel~=2.9.0 -gunicorn~=20.1.0 +Django~=5.2.0 +django-bootstrap3~=26.1 +django-crispy-forms~=2.6 +crispy-bootstrap3~=2024.1 +django-debug-toolbar~=6.3 +django-filter~=25.2 +djangorestframework~=3.17 +django-environ~=0.13 +babel~=2.18 +gunicorn~=26.0