Changed the way the context is passed to render() - this was required

to enable django 1.7 to work (otherwise 1.8, 1.9 pass all tests, but 1.7 fails)
This commit is contained in:
Daryl 2016-06-21 20:56:43 +12:00
parent 558f140bfb
commit 8a7fe5fcbf
2 changed files with 10 additions and 10 deletions

View File

@ -63,8 +63,8 @@ def homepage(request):
knowledgebase_categories = KBCategory.objects.all() knowledgebase_categories = KBCategory.objects.all()
return render(request, template_name='helpdesk/public_homepage.html', return render(request, 'helpdesk/public_homepage.html',
context = { {
'form': form, 'form': form,
'helpdesk_settings': helpdesk_settings, 'helpdesk_settings': helpdesk_settings,
'kb_categories': knowledgebase_categories 'kb_categories': knowledgebase_categories
@ -117,8 +117,8 @@ def view_ticket(request):
if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED: if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED:
redirect_url = reverse('helpdesk_view', args=[ticket_id]) redirect_url = reverse('helpdesk_view', args=[ticket_id])
return render(request, template_name='helpdesk/public_view_ticket.html', return render(request, 'helpdesk/public_view_ticket.html',
context = { {
'ticket': ticket, 'ticket': ticket,
'helpdesk_settings': helpdesk_settings, 'helpdesk_settings': helpdesk_settings,
'next': redirect_url, 'next': redirect_url,

View File

@ -153,8 +153,8 @@ def dashboard(request):
dash_tickets = query_to_dict(cursor.fetchall(), cursor.description) dash_tickets = query_to_dict(cursor.fetchall(), cursor.description)
return render(request, template_name='helpdesk/dashboard.html', return render(request, 'helpdesk/dashboard.html',
context = { {
'user_tickets': tickets, 'user_tickets': tickets,
'user_tickets_closed_resolved': tickets_closed_resolved, 'user_tickets_closed_resolved': tickets_closed_resolved,
'unassigned_tickets': unassigned_tickets, 'unassigned_tickets': unassigned_tickets,
@ -892,8 +892,8 @@ def ticket_list(request):
querydict.pop('page', 1) querydict.pop('page', 1)
return render(request, template_name='helpdesk/ticket_list.html', return render(request, 'helpdesk/ticket_list.html',
context = dict( dict(
context, context,
query_string=querydict.urlencode(), query_string=querydict.urlencode(),
tickets=tickets, tickets=tickets,
@ -1198,8 +1198,8 @@ def run_report(request, report):
data.append(summarytable[item, hdr]) data.append(summarytable[item, hdr])
table.append([item] + data) table.append([item] + data)
return render(request, template_name='helpdesk/report_output.html', return render(request, 'helpdesk/report_output.html',
context = { {
'title': title, 'title': title,
'charttype': charttype, 'charttype': charttype,
'data': table, 'data': table,