Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix for Django 5.1

Browse source
This commit is contained in:
Petr Dlouhý 2024-05-22 09:31:56 +02:00
parent c14479d96a
commit 815e6a231d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
categories/models.py
View file

@ -14,7 +14,6 @@ from .base import CategoryBase
from .settings import ( from .settings import (
RELATION_MODELS, RELATION_MODELS,
RELATIONS, RELATIONS,
THUMBNAIL_STORAGE,
THUMBNAIL_STORAGE_ALIAS, THUMBNAIL_STORAGE_ALIAS,
THUMBNAIL_UPLOAD_PATH, THUMBNAIL_UPLOAD_PATH,
) )
@ -27,6 +26,8 @@ try: # Django 4.2+
except ImportError: except ImportError:
from django.core.files.storage import get_storage_class from django.core.files.storage import get_storage_class
from .settings import THUMBNAIL_STORAGE
STORAGE = get_storage_class(THUMBNAIL_STORAGE)() STORAGE = get_storage_class(THUMBNAIL_STORAGE)()

4
categories/settings.py
View file

@ -11,7 +11,6 @@ DEFAULT_SETTINGS = {
"M2M_REGISTRY": {}, "M2M_REGISTRY": {},
"FK_REGISTRY": {}, "FK_REGISTRY": {},
"THUMBNAIL_UPLOAD_PATH": "uploads/categories/thumbnails", "THUMBNAIL_UPLOAD_PATH": "uploads/categories/thumbnails",
"THUMBNAIL_STORAGE": settings.DEFAULT_FILE_STORAGE,
"THUMBNAIL_STORAGE_ALIAS": "default", "THUMBNAIL_STORAGE_ALIAS": "default",
"JAVASCRIPT_URL": getattr(settings, "STATIC_URL", settings.MEDIA_URL) + "js/", "JAVASCRIPT_URL": getattr(settings, "STATIC_URL", settings.MEDIA_URL) + "js/",
"SLUG_TRANSLITERATOR": "", "SLUG_TRANSLITERATOR": "",
@ -19,6 +18,9 @@ DEFAULT_SETTINGS = {
"RELATION_MODELS": [], "RELATION_MODELS": [],
} }
if hasattr(settings, "DEFAULT_FILE_STORAGE"):
DEFAULT_SETTINGS["THUMBNAIL_STORAGE"] = settings.DEFAULT_FILE_STORAGE
DEFAULT_SETTINGS.update(getattr(settings, "CATEGORIES_SETTINGS", {})) DEFAULT_SETTINGS.update(getattr(settings, "CATEGORIES_SETTINGS", {}))
if DEFAULT_SETTINGS["SLUG_TRANSLITERATOR"]: if DEFAULT_SETTINGS["SLUG_TRANSLITERATOR"]: