mirror of
https://gitea.mueller.network/extern/django-helpdesk.git
synced 2024-11-21 23:43:11 +01:00
updates to remove Django 1.10 deprecation warnings in Django 1.9:
- use of patterns() in urls.py is deprecated - render() functions accept only dicts - introduced checks to ensure downward compatibility back to Django 1.7
This commit is contained in:
Alex Seeholzer
parent
f7f0882f86
commit
2da16c511c
@ -49,6 +49,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
|
||||
along with the File objects to be read. files can be blank.
|
||||
|
||||
"""
|
||||
from django import VERSION
|
||||
from django.conf import settings
|
||||
from django.core.mail import EmailMultiAlternatives
|
||||
from django.template import loader, Context
|
||||
@ -57,7 +58,11 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
|
||||
from helpdesk.settings import HELPDESK_EMAIL_SUBJECT_TEMPLATE
|
||||
import os
|
||||
|
||||
context = Context(email_context)
|
||||
# RemovedInDjango110Warning: render() must be called with a dict, not a Context.
|
||||
if VERSION >= (1, 8):
|
||||
context = email_context
|
||||
else:
|
||||
context = Context(email_context)
|
||||
|
||||
if hasattr(context['queue'], 'locale'):
|
||||
locale = getattr(context['queue'], 'locale', '')
|
||||
|
||||
123
helpdesk/urls.py
123
helpdesk/urls.py
@ -16,7 +16,8 @@ else:
|
||||
from django.contrib.auth.decorators import login_required
|
||||
|
||||
from helpdesk import settings as helpdesk_settings
|
||||
from helpdesk.views import feeds
|
||||
from helpdesk.views import feeds, staff, public, api, kb
|
||||
from django.contrib.auth import views as auth_views
|
||||
|
||||
from django.views.generic import TemplateView
|
||||
class DirectTemplateView(TemplateView):
|
||||
@ -31,135 +32,135 @@ class DirectTemplateView(TemplateView):
|
||||
context[key] = value
|
||||
return context
|
||||
|
||||
urlpatterns = patterns('helpdesk.views.staff',
|
||||
urlpatterns = [
|
||||
url(r'^dashboard/$',
|
||||
'dashboard',
|
||||
staff.dashboard,
|
||||
name='helpdesk_dashboard'),
|
||||
|
||||
url(r'^tickets/$',
|
||||
'ticket_list',
|
||||
staff.ticket_list,
|
||||
name='helpdesk_list'),
|
||||
|
||||
url(r'^tickets/update/$',
|
||||
'mass_update',
|
||||
staff.mass_update,
|
||||
name='helpdesk_mass_update'),
|
||||
|
||||
url(r'^tickets/submit/$',
|
||||
'create_ticket',
|
||||
staff.create_ticket,
|
||||
name='helpdesk_submit'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/$',
|
||||
'view_ticket',
|
||||
staff.view_ticket,
|
||||
name='helpdesk_view'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/followup_edit/(?P<followup_id>[0-9]+)/$',
|
||||
'followup_edit',
|
||||
staff.followup_edit,
|
||||
name='helpdesk_followup_edit'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/followup_delete/(?P<followup_id>[0-9]+)/$',
|
||||
'followup_delete',
|
||||
staff.followup_delete,
|
||||
name='helpdesk_followup_delete'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/edit/$',
|
||||
'edit_ticket',
|
||||
staff.edit_ticket,
|
||||
name='helpdesk_edit'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/update/$',
|
||||
'update_ticket',
|
||||
staff.update_ticket,
|
||||
name='helpdesk_update'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/delete/$',
|
||||
'delete_ticket',
|
||||
staff.delete_ticket,
|
||||
name='helpdesk_delete'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/hold/$',
|
||||
'hold_ticket',
|
||||
staff.hold_ticket,
|
||||
name='helpdesk_hold'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/unhold/$',
|
||||
'unhold_ticket',
|
||||
staff.unhold_ticket,
|
||||
name='helpdesk_unhold'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/cc/$',
|
||||
'ticket_cc',
|
||||
staff.ticket_cc,
|
||||
name='helpdesk_ticket_cc'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/cc/add/$',
|
||||
'ticket_cc_add',
|
||||
staff.ticket_cc_add,
|
||||
name='helpdesk_ticket_cc_add'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/cc/delete/(?P<cc_id>[0-9]+)/$',
|
||||
'ticket_cc_del',
|
||||
staff.ticket_cc_del,
|
||||
name='helpdesk_ticket_cc_del'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/add/$',
|
||||
'ticket_dependency_add',
|
||||
staff.ticket_dependency_add,
|
||||
name='helpdesk_ticket_dependency_add'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$',
|
||||
'ticket_dependency_del',
|
||||
staff.ticket_dependency_del,
|
||||
name='helpdesk_ticket_dependency_del'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/attachment_delete/(?P<attachment_id>[0-9]+)/$',
|
||||
'attachment_del',
|
||||
staff.attachment_del,
|
||||
name='helpdesk_attachment_del'),
|
||||
|
||||
url(r'^raw/(?P<type>\w+)/$',
|
||||
'raw_details',
|
||||
staff.raw_details,
|
||||
name='helpdesk_raw'),
|
||||
|
||||
url(r'^rss/$',
|
||||
'rss_list',
|
||||
staff.rss_list,
|
||||
name='helpdesk_rss_index'),
|
||||
|
||||
url(r'^reports/$',
|
||||
'report_index',
|
||||
staff.report_index,
|
||||
name='helpdesk_report_index'),
|
||||
|
||||
url(r'^reports/(?P<report>\w+)/$',
|
||||
'run_report',
|
||||
staff.run_report,
|
||||
name='helpdesk_run_report'),
|
||||
|
||||
url(r'^save_query/$',
|
||||
'save_query',
|
||||
staff.save_query,
|
||||
name='helpdesk_savequery'),
|
||||
|
||||
url(r'^delete_query/(?P<id>[0-9]+)/$',
|
||||
'delete_saved_query',
|
||||
staff.delete_saved_query,
|
||||
name='helpdesk_delete_query'),
|
||||
|
||||
url(r'^settings/$',
|
||||
'user_settings',
|
||||
staff.user_settings,
|
||||
name='helpdesk_user_settings'),
|
||||
|
||||
url(r'^ignore/$',
|
||||
'email_ignore',
|
||||
staff.email_ignore,
|
||||
name='helpdesk_email_ignore'),
|
||||
|
||||
url(r'^ignore/add/$',
|
||||
'email_ignore_add',
|
||||
staff.email_ignore_add,
|
||||
name='helpdesk_email_ignore_add'),
|
||||
|
||||
url(r'^ignore/delete/(?P<id>[0-9]+)/$',
|
||||
'email_ignore_del',
|
||||
staff.email_ignore_del,
|
||||
name='helpdesk_email_ignore_del'),
|
||||
)
|
||||
]
|
||||
|
||||
urlpatterns += patterns('helpdesk.views.public',
|
||||
urlpatterns += [
|
||||
url(r'^$',
|
||||
'homepage',
|
||||
public.homepage,
|
||||
name='helpdesk_home'),
|
||||
|
||||
url(r'^view/$',
|
||||
'view_ticket',
|
||||
public.view_ticket,
|
||||
name='helpdesk_public_view'),
|
||||
|
||||
url(r'^change_language/$',
|
||||
'change_language',
|
||||
public.change_language,
|
||||
name='helpdesk_public_change_language'),
|
||||
)
|
||||
]
|
||||
|
||||
urlpatterns += patterns('',
|
||||
urlpatterns += [
|
||||
url(r'^rss/user/(?P<user_name>[^/]+)/$',
|
||||
login_required(feeds.OpenTicketsByUser()),
|
||||
name='helpdesk_rss_user'),
|
||||
@ -167,60 +168,66 @@ urlpatterns += patterns('',
|
||||
url(r'^rss/user/(?P<user_name>[^/]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
|
||||
login_required(feeds.OpenTicketsByUser()),
|
||||
name='helpdesk_rss_user_queue'),
|
||||
|
||||
|
||||
url(r'^rss/queue/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
|
||||
login_required(feeds.OpenTicketsByQueue()),
|
||||
name='helpdesk_rss_queue'),
|
||||
|
||||
|
||||
url(r'^rss/unassigned/$',
|
||||
login_required(feeds.UnassignedTickets()),
|
||||
name='helpdesk_rss_unassigned'),
|
||||
|
||||
|
||||
url(r'^rss/recent_activity/$',
|
||||
login_required(feeds.RecentFollowUps()),
|
||||
name='helpdesk_rss_activity'),
|
||||
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
urlpatterns += patterns('',
|
||||
urlpatterns += [
|
||||
url(r'^api/(?P<method>[a-z_-]+)/$',
|
||||
'helpdesk.views.api.api',
|
||||
api.api,
|
||||
name='helpdesk_api'),
|
||||
|
||||
url(r'^login/$',
|
||||
'django.contrib.auth.views.login',
|
||||
auth_views.login,
|
||||
{'template_name': 'helpdesk/registration/login.html'},
|
||||
name='login'),
|
||||
|
||||
url(r'^logout/$',
|
||||
'django.contrib.auth.views.logout',
|
||||
auth_views.logout,
|
||||
{'template_name': 'helpdesk/registration/login.html', 'next_page': '../'},
|
||||
name='logout'),
|
||||
)
|
||||
]
|
||||
|
||||
if helpdesk_settings.HELPDESK_KB_ENABLED:
|
||||
urlpatterns += patterns('helpdesk.views.kb',
|
||||
urlpatterns += [
|
||||
url(r'^kb/$',
|
||||
'index', name='helpdesk_kb_index'),
|
||||
kb.index,
|
||||
name='helpdesk_kb_index'),
|
||||
|
||||
url(r'^kb/(?P<item>[0-9]+)/$',
|
||||
'item', name='helpdesk_kb_item'),
|
||||
kb.item,
|
||||
name='helpdesk_kb_item'),
|
||||
|
||||
url(r'^kb/(?P<item>[0-9]+)/vote/$',
|
||||
'vote', name='helpdesk_kb_vote'),
|
||||
kb.vote,
|
||||
name='helpdesk_kb_vote'),
|
||||
|
||||
url(r'^kb/(?P<slug>[A-Za-z0-9_-]+)/$',
|
||||
'category', name='helpdesk_kb_category'),
|
||||
)
|
||||
kb.category,
|
||||
name='helpdesk_kb_category'),
|
||||
]
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url(r'^api/$', TemplateView.as_view(template_name='helpdesk/help_api.html'),
|
||||
urlpatterns += [
|
||||
url(r'^api/$',
|
||||
TemplateView.as_view(template_name='helpdesk/help_api.html'),
|
||||
name='helpdesk_api_help'),
|
||||
|
||||
url(r'^help/context/$', TemplateView.as_view(template_name='helpdesk/help_context.html'),
|
||||
url(r'^help/context/$',
|
||||
TemplateView.as_view(template_name='helpdesk/help_context.html'),
|
||||
name='helpdesk_help_context'),
|
||||
|
||||
url(r'^system_settings/$', DirectTemplateView.as_view(template_name='helpdesk/system_settings.html'),
|
||||
url(r'^system_settings/$',
|
||||
DirectTemplateView.as_view(template_name='helpdesk/system_settings.html'),
|
||||
name='helpdesk_system_settings'),
|
||||
)
|
||||
]
|
||||
|
||||
@ -11,6 +11,7 @@ from django.utils.encoding import python_2_unicode_compatible
|
||||
from datetime import datetime, timedelta
|
||||
import sys
|
||||
|
||||
from django import VERSION
|
||||
from django.conf import settings
|
||||
try:
|
||||
from django.contrib.auth import get_user_model
|
||||
@ -374,7 +375,6 @@ def update_ticket(request, ticket_id, public=False):
|
||||
# then the following line will give us a crash, since django expects {% if %}
|
||||
# to be closed with an {% endif %} tag.
|
||||
|
||||
|
||||
# get_template_from_string was removed in Django 1.8 http://django.readthedocs.org/en/1.8.x/ref/templates/upgrading.html
|
||||
try:
|
||||
from django.template import engines
|
||||
@ -382,7 +382,11 @@ def update_ticket(request, ticket_id, public=False):
|
||||
except ImportError: # occurs in django < 1.8
|
||||
template_func = loader.get_template_from_string
|
||||
|
||||
comment = template_func(comment).render(Context(context))
|
||||
# RemovedInDjango110Warning: render() must be called with a dict, not a Context.
|
||||
if VERSION < (1, 8):
|
||||
context = Context(context)
|
||||
|
||||
comment = template_func(comment).render(context)
|
||||
|
||||
if owner is -1 and ticket.assigned_to:
|
||||
owner = ticket.assigned_to.id
|
||||
|
||||
Loading…
Reference in New Issue
Block a user