Merge pull request #883 from alligatorbait/master

Updates required to work with Django 3.x
django-helpdesk · Oct 13, 2020 · 35cde5a · 35cde5a
2 parents c9e0a51 + df4024d
commit 35cde5a
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 19 deletions.
diff --git a/helpdesk/decorators.py b/helpdesk/decorators.py
@@ -4,7 +4,6 @@
 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
@@ -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
@@ -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_ %}
 <!DOCTYPE html>

diff --git a/helpdesk/templates/helpdesk/base_js.html b/helpdesk/templates/helpdesk/base_js.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 <!-- jQuery and Bootstrap Core -->
 {% if helpdesk_settings.HELPDESK_USE_CDN %}
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>

diff --git 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 %}
 <div class="form-row">
     <div class="col col-sm-3">

diff --git 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 %}
 <div class="form-row">
     <div class="col col-sm-3">

diff --git 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 %}
 <div class="form-row">
     <div class="col col-sm-3">

diff --git 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 %}
   <div class="form-row">
     <div class="col col-sm-3">
       <label for='id_sort' class="col-form-label">{% trans "Sorting" %}:</label>

diff --git 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 %}
 <div class="form-row">
     <div class="col col-sm-3">

diff --git 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 %}
 <!DOCTYPE html>

diff --git 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
@@ -1,5 +1,5 @@
 {% extends "helpdesk/base.html" %}{% load i18n %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block helpdesk_title %}{% trans "Reports &amp; Statistics" %}{% endblock %}
 

diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 {% load i18n humanize ticket_to_link %}
-{% load static from staticfiles %}
+{% load static %}
 
 <div class="card mb-3">
     <!--div class="card-header">

diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
@@ -1,6 +1,6 @@
 {% extends "helpdesk/base.html" %}
 {% load i18n humanize %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block helpdesk_title %}{% trans "Tickets" %}{% endblock %}
 

diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
@@ -1218,6 +1218,9 @@ def run_report(request, report):
     except QueryLoadError:
         return HttpResponseRedirect(reverse('helpdesk:report_index'))
 
+    if request.GET.get('saved_query', None):
+        Query(report_queryset, query_to_base64(query_params))
+
     from collections import defaultdict
     summarytable = defaultdict(int)
     # a second table for more complex queries