From e64da5bebe3a8fa433322b2173b50a21a11fd3c7 Mon Sep 17 00:00:00 2001 From: mbaker Date: Wed, 16 Jun 2021 10:31:54 -0700 Subject: [PATCH 1/3] [DEV-19144] Chanage module import django.contrib.staticfiles.templatetags has been deprecated in Django3+ django.templatetags.static --- ui_extensions/bolty_cards/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui_extensions/bolty_cards/views.py b/ui_extensions/bolty_cards/views.py index 1efd46ac..6a95c13d 100644 --- a/ui_extensions/bolty_cards/views.py +++ b/ui_extensions/bolty_cards/views.py @@ -2,7 +2,7 @@ from django.conf import settings from django.core.management import call_command -from django.contrib.staticfiles.templatetags.staticfiles import static +from django.templatetags.static import static from django.shortcuts import render from django.utils.html import mark_safe from extensions.views import dashboard_extension From e5dea5e91f6097a4da7bb28eee64f4e950c2f8b3 Mon Sep 17 00:00:00 2001 From: mbaker Date: Wed, 16 Jun 2021 14:07:22 -0700 Subject: [PATCH 2/3] [DEV-19144] Check for django version at ui_extensions root init. Use xui.static in bolty_cards.view --- ui_extensions/__init__.py | 7 +++++++ ui_extensions/bolty_cards/views.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ui_extensions/__init__.py b/ui_extensions/__init__.py index e69de29b..7a6f5c36 100644 --- a/ui_extensions/__init__.py +++ b/ui_extensions/__init__.py @@ -0,0 +1,7 @@ +import django +if int(django.get_version()[0]) < 3: + from django.contrib.staticfiles.templatetags.staticfiles import static +else: + from django.templatetags.static import static + +__all__ = ["static"] \ No newline at end of file diff --git a/ui_extensions/bolty_cards/views.py b/ui_extensions/bolty_cards/views.py index 6a95c13d..bb12502c 100644 --- a/ui_extensions/bolty_cards/views.py +++ b/ui_extensions/bolty_cards/views.py @@ -2,7 +2,7 @@ from django.conf import settings from django.core.management import call_command -from django.templatetags.static import static +import xui.static from django.shortcuts import render from django.utils.html import mark_safe from extensions.views import dashboard_extension From fbda39ecf76d55fed11980707aa15fe082d61b77 Mon Sep 17 00:00:00 2001 From: mbaker Date: Thu, 17 Jun 2021 09:54:15 -0700 Subject: [PATCH 3/3] [DEV-19144] Remove from ui_extensions init, put django version check in the views import --- ui_extensions/__init__.py | 7 ------- ui_extensions/bolty_cards/views.py | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ui_extensions/__init__.py b/ui_extensions/__init__.py index 7a6f5c36..e69de29b 100644 --- a/ui_extensions/__init__.py +++ b/ui_extensions/__init__.py @@ -1,7 +0,0 @@ -import django -if int(django.get_version()[0]) < 3: - from django.contrib.staticfiles.templatetags.staticfiles import static -else: - from django.templatetags.static import static - -__all__ = ["static"] \ No newline at end of file diff --git a/ui_extensions/bolty_cards/views.py b/ui_extensions/bolty_cards/views.py index bb12502c..9476d918 100644 --- a/ui_extensions/bolty_cards/views.py +++ b/ui_extensions/bolty_cards/views.py @@ -2,7 +2,11 @@ from django.conf import settings from django.core.management import call_command -import xui.static +import django +if int(django.get_version()[0]) < 3: + from django.contrib.staticfiles.templatetags.staticfiles import static +else: + from django.templatetags.static import static from django.shortcuts import render from django.utils.html import mark_safe from extensions.views import dashboard_extension