extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 16:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge current 'master' state into urls_app_name

Browse Source
This commit is contained in:
Alex Barcelo
2016-10-19 15:26:04 +02:00
parent 4ca5e13ff1 0d8e81d7f0
commit afd6ebad74
147 changed files with 20226 additions and 3152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
helpdesk/views/public.py
View File

@ -9,7 +9,7 @@ views/public.py - All public facing views, eg non-staff (no authentication
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, Http404, HttpResponse
from django.shortcuts import render_to_response, get_object_or_404
from django.shortcuts import render, get_object_or_404
from django.template import loader, Context, RequestContext
from django.utils.translation import ugettext as _
@ -25,7 +25,7 @@ def homepage(request):
if (request.user.is_staff or (request.user.is_authenticated() and helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE)):
try:
if getattr(request.user.usersettings.settings, 'login_view_ticketlist', False):
if request.user.usersettings.settings.get('login_view_ticketlist', False):
return HttpResponseRedirect(reverse('helpdesk:list'))
else:
return HttpResponseRedirect(reverse('helpdesk:dashboard'))
@ -38,7 +38,7 @@ def homepage(request):
if form.is_valid():
if text_is_spam(form.cleaned_data['body'], request):
# This submission is spam. Let's not save it.
return render_to_response('helpdesk/public_spam.html', RequestContext(request, {}))
return render(request, template_name='helpdesk/public_spam.html')
else:
ticket = form.save()
return HttpResponseRedirect('%s?ticket=%s&email=%s'% (
@ -63,12 +63,12 @@ def homepage(request):
knowledgebase_categories = KBCategory.objects.all()
return render_to_response('helpdesk/public_homepage.html',
RequestContext(request, {
return render(request, 'helpdesk/public_homepage.html',
{
'form': form,
'helpdesk_settings': helpdesk_settings,
'kb_categories': knowledgebase_categories
}))
})
def view_ticket(request):
@ -78,12 +78,9 @@ def view_ticket(request):
error_message = ''
if ticket_req and email:
parts = ticket_req.split('-')
queue = '-'.join(parts[0:-1])
ticket_id = parts[-1]
queue, ticket_id = Ticket.queue_and_id_from_query(ticket_req)
try:
ticket = Ticket.objects.get(id=ticket_id, queue__slug__iexact=queue, submitter_email__iexact=email)
ticket = Ticket.objects.get(id=ticket_id, submitter_email__iexact=email)
except:
ticket = False
error_message = _('Invalid ticket ID or e-mail address. Please try again.')
@ -117,25 +114,25 @@ def view_ticket(request):
if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED:
redirect_url = reverse('helpdesk:view', args=[ticket_id])
return render_to_response('helpdesk/public_view_ticket.html',
RequestContext(request, {
return render(request, 'helpdesk/public_view_ticket.html',
{
'ticket': ticket,
'helpdesk_settings': helpdesk_settings,
'next': redirect_url,
}))
})
return render_to_response('helpdesk/public_view_form.html',
RequestContext(request, {
return render(request, template_name='helpdesk/public_view_form.html',
context = {
'ticket': ticket,
'email': email,
'error_message': error_message,
'helpdesk_settings': helpdesk_settings,
}))
})
def change_language(request):
return_to = ''
if 'return_to' in request.GET:
return_to = request.GET['return_to']
return render_to_response('helpdesk/public_change_language.html',
RequestContext(request, {'next': return_to}))
return render(request, template_name='helpdesk/public_change_language.html',
context = {'next': return_to})