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 0.2.17 release into develop

Browse Source
This commit is contained in:
Garret Wassermann
2019-08-27 21:53:25 -04:00
parent 66ab507c15 6d538da0f0
commit 7f27eb9428
9 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
helpdesk/urls.py
View File

@ -14,7 +14,7 @@ from django.views.generic import TemplateView
from helpdesk.decorators import helpdesk_staff_member_required, protect_view
from helpdesk import settings as helpdesk_settings
from helpdesk.views import feeds, staff, public, kb
from helpdesk.views import feeds, staff, public, kb, login
try:
import helpdesk.tasks
except ImportError:
@ -194,8 +194,7 @@ urlpatterns += [
urlpatterns += [
url(r'^login/$',
auth_views.LoginView.as_view(
template_name='helpdesk/registration/login.html'),
login.login,
name='login'),
url(r'^logout/$',