extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-01-23 14:28:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Custom User model changes.

Browse Source
This commit is contained in:
Issac Kelly 2014-07-15 14:02:31 -07:00
parent dc7eb28ee8
commit 978c0665b8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpdesk/urls.py
View File

@ -160,11 +160,11 @@ urlpatterns += patterns('helpdesk.views.public',
) )
urlpatterns += patterns('', urlpatterns += patterns('',
url(r'^rss/user/(?P<user_name>[\.\@A-Za-z0-9_-]+)/$', url(r'^rss/user/(?P<user_name>[^/]+)/$',
login_required(feeds.OpenTicketsByUser()), login_required(feeds.OpenTicketsByUser()),
name='helpdesk_rss_user'), name='helpdesk_rss_user'),
url(r'^rss/user/(?P<user_name>[\.\@A-Za-z0-9_-]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$', url(r'^rss/user/(?P<user_name>[^/]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
login_required(feeds.OpenTicketsByUser()), login_required(feeds.OpenTicketsByUser()),
name='helpdesk_rss_user_queue'), name='helpdesk_rss_user_queue'),

4
helpdesk/views/staff.py
View File

@ -237,9 +237,9 @@ def view_ticket(request, ticket_id):
return update_ticket(request, ticket_id) return update_ticket(request, ticket_id)
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS: if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS:
users = User.objects.filter(is_active=True, is_staff=True).order_by('username') users = User.objects.filter(is_active=True, is_staff=True).order_by(User.USERNAME_FIELD)
else: else:
users = User.objects.filter(is_active=True).order_by('username') users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
# TODO: shouldn't this template get a form to begin with? # TODO: shouldn't this template get a form to begin with?