Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions barsys/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion barsys/templates/barsys/admin/base.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'bootstrap3/bootstrap3.html' %}

{% load bootstrap3 %}
{% load staticfiles %}
{% load static %}
{% block bootstrap3_title %}Barsys management{% endblock %}
{% block bootstrap3_extra_head %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion barsys/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import url
from django.urls import re_path as url

from . import views

Expand Down
12 changes: 6 additions & 6 deletions pybarsys/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 = [
Expand All @@ -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",
]

Expand Down
4 changes: 2 additions & 2 deletions pybarsys/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -39,7 +39,7 @@
),
]

if settings.DEBUG:
if "debug_toolbar" in settings.INSTALLED_APPS:
import debug_toolbar

urlpatterns = [
Expand Down
19 changes: 10 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Loading