mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2025-08-10 00:17:54 +02:00
Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url
Conflicts: helpdesk/urls.py
This commit is contained in:
@ -8,13 +8,28 @@ urls.py - Mapping of URL's to our various views. Note we always used NAMED
|
||||
"""
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls.defaults import *
|
||||
import django
|
||||
if django.get_version().startswith("1.3"):
|
||||
from django.conf.urls.defaults import *
|
||||
else:
|
||||
from django.conf.urls import *
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.syndication.views import feed as django_feed
|
||||
|
||||
from helpdesk import settings as helpdesk_settings
|
||||
from helpdesk.views.feeds import feed_setup
|
||||
from helpdesk.views import feeds
|
||||
|
||||
from django.views.generic import TemplateView
|
||||
class DirectTemplateView(TemplateView):
|
||||
extra_context = None
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(self.__class__, self).get_context_data(**kwargs)
|
||||
if self.extra_context is not None:
|
||||
for key, value in self.extra_context.items():
|
||||
if callable(value):
|
||||
context[key] = value()
|
||||
else:
|
||||
context[key] = value
|
||||
return context
|
||||
|
||||
urlpatterns = patterns('helpdesk.views.staff',
|
||||
url(r'^dashboard/$',
|
||||
@ -41,6 +56,10 @@ urlpatterns = patterns('helpdesk.views.staff',
|
||||
'followup_edit',
|
||||
name='helpdesk_followup_edit'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/followup_delete/(?P<followup_id>[0-9]+)/$',
|
||||
'followup_delete',
|
||||
name='helpdesk_followup_delete'),
|
||||
|
||||
url(r'^tickets/(?P<ticket_id>[0-9]+)/edit/$',
|
||||
'edit_ticket',
|
||||
name='helpdesk_edit'),
|
||||
@ -141,11 +160,30 @@ urlpatterns += patterns('helpdesk.views.public',
|
||||
)
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url(r'^rss/(?P<url>.*)/$',
|
||||
login_required(django_feed),
|
||||
{'feed_dict': feed_setup},
|
||||
name='helpdesk_rss'),
|
||||
url(r'^rss/user/(?P<user_name>[^/]+)/$',
|
||||
login_required(feeds.OpenTicketsByUser()),
|
||||
name='helpdesk_rss_user'),
|
||||
|
||||
url(r'^rss/user/(?P<user_name>[^/]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
|
||||
login_required(feeds.OpenTicketsByUser()),
|
||||
name='helpdesk_rss_user_queue'),
|
||||
|
||||
url(r'^rss/queue/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
|
||||
login_required(feeds.OpenTicketsByQueue()),
|
||||
name='helpdesk_rss_queue'),
|
||||
|
||||
url(r'^rss/unassigned/$',
|
||||
login_required(feeds.UnassignedTickets()),
|
||||
name='helpdesk_rss_unassigned'),
|
||||
|
||||
url(r'^rss/recent_activity/$',
|
||||
login_required(feeds.RecentFollowUps()),
|
||||
name='helpdesk_rss_activity'),
|
||||
|
||||
)
|
||||
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url(r'^api/(?P<method>[a-z_-]+)/$',
|
||||
'helpdesk.views.api.api',
|
||||
name='helpdesk_api'),
|
||||
@ -177,18 +215,12 @@ if helpdesk_settings.HELPDESK_KB_ENABLED:
|
||||
)
|
||||
|
||||
urlpatterns += patterns('',
|
||||
url(r'^api/$',
|
||||
'django.views.generic.simple.direct_to_template',
|
||||
{'template': 'helpdesk/help_api.html',},
|
||||
url(r'^api/$', TemplateView.as_view(template_name='helpdesk/help_api.html'),
|
||||
name='helpdesk_api_help'),
|
||||
|
||||
url(r'^help/context/$',
|
||||
'django.views.generic.simple.direct_to_template',
|
||||
{'template': 'helpdesk/help_context.html',},
|
||||
url(r'^help/context/$', TemplateView.as_view(template_name='helpdesk/help_context.html'),
|
||||
name='helpdesk_help_context'),
|
||||
|
||||
url(r'^system_settings/$',
|
||||
'django.views.generic.simple.direct_to_template',
|
||||
{'template': 'helpdesk/system_settings.html',},
|
||||
url(r'^system_settings/$', DirectTemplateView.as_view(template_name='helpdesk/system_settings.html'),
|
||||
name='helpdesk_system_settings'),
|
||||
)
|
||||
|
Reference in New Issue
Block a user