Skip to content

fix: added exception to fix EXTRA_MODEL_FIELDS compatability #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrisoHarlaar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: added exception to fix EXTRA_MODEL_FIELDS compatability #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion filebrowser_safe/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
from time import gmtime, localtime, strftime, time

from django.conf import settings as dj_settings
from django.core.exceptions import AppRegistryNotReady
from django.core.files.storage import default_storage

from filebrowser_safe import settings as fb_settings

try:
from mezzanine.utils.sites import current_site_id
except ImportError:
except (AppRegistryNotReady, ImportError) as e:
# TODO: filebrowser-safe should not rely on `current_site_id` at all since its
# provided by Mezzanine.
#
Expand Down