diff --git a/helpdesk/decorators.py b/helpdesk/decorators.py index 28dfe2aa..1dedbc02 100644 --- a/helpdesk/decorators.py +++ b/helpdesk/decorators.py @@ -4,7 +4,6 @@ from django.core.exceptions import PermissionDenied from django.http import Http404 from django.shortcuts import redirect -from django.utils.decorators import available_attrs from django.contrib.auth.decorators import user_passes_test @@ -48,7 +47,7 @@ def protect_view(view_func): Decorator for protecting the views checking user, redirecting to the log-in page if necessary or returning 404 status code """ - @wraps(view_func, assigned=available_attrs(view_func)) + @wraps(view_func) def _wrapped_view(request, *args, **kwargs): if not request.user.is_authenticated and helpdesk_settings.HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT: return redirect('helpdesk:login') @@ -64,7 +63,7 @@ def staff_member_required(view_func): Decorator for staff member the views checking user, redirecting to the log-in page if necessary or returning 403 """ - @wraps(view_func, assigned=available_attrs(view_func)) + @wraps(view_func) def _wrapped_view(request, *args, **kwargs): if not request.user.is_authenticated and not request.user.is_active: return redirect('helpdesk:login') @@ -80,7 +79,7 @@ def superuser_required(view_func): Decorator for superuser member the views checking user, redirecting to the log-in page if necessary or returning 403 """ - @wraps(view_func, assigned=available_attrs(view_func)) + @wraps(view_func) def _wrapped_view(request, *args, **kwargs): if not request.user.is_authenticated and not request.user.is_active: return redirect('helpdesk:login') diff --git a/helpdesk/templates/helpdesk/base-head.html b/helpdesk/templates/helpdesk/base-head.html index b1fcb5fa..9b132f6f 100644 --- a/helpdesk/templates/helpdesk/base-head.html +++ b/helpdesk/templates/helpdesk/base-head.html @@ -1,7 +1,7 @@ {% load i18n %} {% load saved_queries %} {% load load_helpdesk_settings %} -{% load static from staticfiles %} +{% load static %} {% with request|load_helpdesk_settings as helpdesk_settings %} {% with user|saved_queries as user_saved_queries_ %} diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index 2e7ed15d..4b243ead 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -1,7 +1,7 @@ {% load i18n %} {% load saved_queries %} {% load load_helpdesk_settings %} -{% load static from staticfiles %} +{% load static %} {% with request|load_helpdesk_settings as helpdesk_settings %} {% with user|saved_queries as user_saved_queries_ %} diff --git a/helpdesk/templates/helpdesk/base_js.html b/helpdesk/templates/helpdesk/base_js.html index d7bcdecc..34a823f5 100644 --- a/helpdesk/templates/helpdesk/base_js.html +++ b/helpdesk/templates/helpdesk/base_js.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} {% if helpdesk_settings.HELPDESK_USE_CDN %} diff --git a/helpdesk/templates/helpdesk/filters/kbitems.html b/helpdesk/templates/helpdesk/filters/kbitems.html index 1a1be9d7..17cab5f7 100644 --- a/helpdesk/templates/helpdesk/filters/kbitems.html +++ b/helpdesk/templates/helpdesk/filters/kbitems.html @@ -1,5 +1,5 @@ {% load i18n humanize %} -{% load static from staticfiles %} +{% load static %} {% load in_list %}
diff --git a/helpdesk/templates/helpdesk/filters/owner.html b/helpdesk/templates/helpdesk/filters/owner.html index 5ec82aeb..20ed9446 100644 --- a/helpdesk/templates/helpdesk/filters/owner.html +++ b/helpdesk/templates/helpdesk/filters/owner.html @@ -1,5 +1,5 @@ {% load i18n humanize %} -{% load static from staticfiles %} +{% load static %} {% load in_list %}
diff --git a/helpdesk/templates/helpdesk/filters/queue.html b/helpdesk/templates/helpdesk/filters/queue.html index 90caf4be..dd66d53d 100644 --- a/helpdesk/templates/helpdesk/filters/queue.html +++ b/helpdesk/templates/helpdesk/filters/queue.html @@ -1,5 +1,5 @@ {% load i18n humanize %} -{% load static from staticfiles %} +{% load static %} {% load in_list %}
diff --git a/helpdesk/templates/helpdesk/filters/sorting.html b/helpdesk/templates/helpdesk/filters/sorting.html index e9e08772..b9295fad 100644 --- a/helpdesk/templates/helpdesk/filters/sorting.html +++ b/helpdesk/templates/helpdesk/filters/sorting.html @@ -1,5 +1,5 @@ {% load i18n humanize %} -{% load static from staticfiles %} +{% load static %}
diff --git a/helpdesk/templates/helpdesk/filters/status.html b/helpdesk/templates/helpdesk/filters/status.html index edbc127a..8c2ce03f 100644 --- a/helpdesk/templates/helpdesk/filters/status.html +++ b/helpdesk/templates/helpdesk/filters/status.html @@ -1,5 +1,5 @@ {% load i18n humanize %} -{% load static from staticfiles %} +{% load static %} {% load in_list %}
diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index 305f60c3..ca0b74e1 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -1,5 +1,5 @@ {% load i18n %} -{% load static from staticfiles %} +{% load static %} {% load load_helpdesk_settings %} {% with request|load_helpdesk_settings as helpdesk_settings %} diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html index 84c31617..4e4d6a85 100644 --- a/helpdesk/templates/helpdesk/public_view_ticket.html +++ b/helpdesk/templates/helpdesk/public_view_ticket.html @@ -1,5 +1,5 @@ {% extends "helpdesk/public_base.html" %}{% load i18n humanize %} -{% load static from staticfiles %} +{% load static %} {% block helpdesk_title %}{% trans "View a Ticket" %}{% endblock %} {% block helpdesk_body %} diff --git a/helpdesk/templates/helpdesk/report_output.html b/helpdesk/templates/helpdesk/report_output.html index e73bac0d..69497b03 100644 --- a/helpdesk/templates/helpdesk/report_output.html +++ b/helpdesk/templates/helpdesk/report_output.html @@ -1,5 +1,5 @@ {% extends "helpdesk/base.html" %}{% load i18n %} -{% load static from staticfiles %} +{% load static %} {% block helpdesk_title %}{% trans "Reports & Statistics" %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/rss_list.html b/helpdesk/templates/helpdesk/rss_list.html index 5c3904b5..ab41f7ea 100644 --- a/helpdesk/templates/helpdesk/rss_list.html +++ b/helpdesk/templates/helpdesk/rss_list.html @@ -1,5 +1,5 @@ {% extends "helpdesk/base.html" %}{% load i18n %} -{% load static from staticfiles %} +{% load static %} {% block helpdesk_title %}{% trans "RSS Feeds" %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index 84a78b16..50cc3334 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -1,6 +1,6 @@ {% extends "helpdesk/base.html" %} {% load i18n bootstrap4form humanize %} -{% load static from staticfiles %} +{% load static %} diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index 8a614c73..038fc05e 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -1,5 +1,5 @@ {% load i18n humanize ticket_to_link %} -{% load static from staticfiles %} +{% load static %}