extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-19 17:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #429 from reduxionist/PR412-resubmit

Browse Source 
Thanks again for the contribution @mrkiwi-nz, and my apologies for accidentally closing the original PR!
This commit is contained in:
Jonathan Barratt 2016-10-20 12:08:00 +07:00 committed by GitHub
commit 855c0b07be
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpdesk/urls.py
View File

@ -10,9 +10,9 @@ urls.py - Mapping of URL's to our various views. Note we always used NAMED
from django.conf import settings from django.conf import settings
import django import django
if django.get_version().startswith("1.3"): if django.get_version().startswith("1.3"):
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
else: else:
from django.conf.urls import * from django.conf.urls import *
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from helpdesk import settings as helpdesk_settings from helpdesk import settings as helpdesk_settings

2
helpdesk/views/staff.py
View File

@ -862,7 +862,7 @@ def ticket_list(request):
try: try:
page = int(request.GET.get('page', '1')) page = int(request.GET.get('page', '1'))
except ValueError: except ValueError:
page = 1 page = 1
try: try:
tickets = ticket_paginator.page(page) tickets = ticket_paginator.page(page)