diff --git a/flowspec/test_viewsets.py b/flowspec/test_viewsets.py index 639d9248a6f384be605435a515b2da425d5a08eb..184de354228a61ea30462b9d8be3a74bd6f2bb13 100644 --- a/flowspec/test_viewsets.py +++ b/flowspec/test_viewsets.py @@ -9,6 +9,11 @@ from rest_framework.authtoken.models import Token import requests #import list +#if DEBUG: +# warnings.simplefilter('ignore', category=RemovedInDjango40Warning) + +# + assert settings.ROUTES_DUPLICATES_CHECKING == False #dirname1 = os.path.dirname(__file__) diff --git a/flowspec/views.py b/flowspec/views.py index 9e02b6bedfe961f38d660dd3cbfb7aa0b6e51dbf..b6fb570a3168c5ce4983128de0433b6505f2524c 100644 --- a/flowspec/views.py +++ b/flowspec/views.py @@ -521,7 +521,8 @@ def edit_route(request, route_slug): else: if (not route_original.status == 'ACTIVE'): route_edit.expires = datetime.date.today() + datetime.timedelta(days=settings.EXPIRATION_DAYS_OFFSET-1) - dictionary = model_to_dict(route_edit, fields=[], exclude=[]) + #dictionary = model_to_dict(route_edit, fields=[], exclude=[]) + dictionary = model_to_dict(route_edit, exclude=[]) dictionary["name"] = route_edit.name_visible if request.user.is_superuser: dictionary['issuperuser'] = request.user.username diff --git a/flowspy/settings.py.dist b/flowspy/settings.py.dist index 6f251cd6786690e20d75f6fd37814778b10daecc..6ecead596488b46e7c465a92332ec8731c919976 100644 --- a/flowspy/settings.py.dist +++ b/flowspy/settings.py.dist @@ -189,7 +189,10 @@ TEMPLATES = [ "django.contrib.auth.context_processors.auth", 'django_settings_export.settings_export', 'django.contrib.messages.context_processors.messages' - ] + ], + 'libraries': { # Adding this section should work around the issue. + 'staticfiles' : 'django.templatetags.static', + } }, }, ] diff --git a/requirements.txt b/requirements.txt index 43011e792b0e74499fb5d603d9ca46061fa54cd8..9b2fc0b5c7473b5250701d089e5cd8a7f30a2e76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools==59.1.1 +setuptools argparse cl celery==5.2.3 @@ -9,7 +9,7 @@ djangorestframework==3.12.0 django-tinymce django-form-utils django-settings-export -Django==2.2.28 +Django==3.2.16 gevent greenlet gunicorn