extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-01-07 22:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from brente/no-admin-url

Browse Source 
Remove undocumented ADMIN_URL setting
This commit is contained in:
Ross Poulton 2014-07-22 10:09:45 +10:00
commit a2a214d33d
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helpdesk/templates/helpdesk/system_settings.html
View File

@ -8,12 +8,12 @@
<p>The following items can be maintained by you or other superusers:</p>{% endblocktrans %} <p>The following items can be maintained by you or other superusers:</p>{% endblocktrans %}
<ul> <ul>
<li><a href='../ignore/'>{% trans "E-Mail Ignore list" %}</a></li> <li><a href='{% url 'helpdesk_email_ignore' %}'>{% trans "E-Mail Ignore list" %}</a></li>
<li><a href='{{ ADMIN_URL }}helpdesk/queue/'>{% trans "Maintain Queues" %}</a></li> <li><a href='{% url 'admin:helpdesk_queue_changelist' %}'>{% trans "Maintain Queues" %}</a></li>
<li><a href='{{ ADMIN_URL }}helpdesk/presetreply/'>{% trans "Maintain Pre-Set Replies" %}</a></li> <li><a href='{% url 'admin:helpdesk_presetreply_changelist' %}'>{% trans "Maintain Pre-Set Replies" %}</a></li>
<li><a href='{{ ADMIN_URL }}helpdesk/kbcategory/'>{% trans "Maintain Knowledgebase Categories" %}</a></li> <li><a href='{% url 'admin:helpdesk_kbcategory_changelist' %}'>{% trans "Maintain Knowledgebase Categories" %}</a></li>
<li><a href='{{ ADMIN_URL }}helpdesk/kbitem/'>{% trans "Maintain Knowledgebase Items" %}</a></li> <li><a href='{% url 'admin:helpdesk_kbitem_changelist' %}'>{% trans "Maintain Knowledgebase Items" %}</a></li>
<li><a href='{{ ADMIN_URL }}helpdesk/emailtemplate/'>{% trans "Maintain E-Mail Templates" %}</a></li> <li><a href='{% url 'admin:helpdesk_emailtemplate_changelist' %}'>{% trans "Maintain E-Mail Templates" %}</a></li>
<li><a href='{{ ADMIN_URL }}auth/user/'>{% trans "Maintain Users" %}</a></li> <li><a href='{% url 'admin:auth_user_changelist' %}'>{% trans "Maintain Users" %}</a></li>
</ul> </ul>
{% endblock %} {% endblock %}

15
helpdesk/urls.py
View File

@ -99,7 +99,7 @@ urlpatterns = patterns('helpdesk.views.staff',
url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$', url(r'^tickets/(?P<ticket_id>[0-9]+)/dependency/delete/(?P<dependency_id>[0-9]+)/$',
'ticket_dependency_del', 'ticket_dependency_del',
name='helpdesk_ticket_dependency_del'), name='helpdesk_ticket_dependency_del'),
url(r'^tickets/(?P<ticket_id>[0-9]+)/attachment_delete/(?P<attachment_id>[0-9]+)/$', url(r'^tickets/(?P<ticket_id>[0-9]+)/attachment_delete/(?P<attachment_id>[0-9]+)/$',
'attachment_del', 'attachment_del',
name='helpdesk_attachment_del'), name='helpdesk_attachment_del'),
@ -156,7 +156,7 @@ urlpatterns += patterns('helpdesk.views.public',
url(r'^change_language/$', url(r'^change_language/$',
'change_language', 'change_language',
name='helpdesk_public_change_language'), name='helpdesk_public_change_language'),
) )
urlpatterns += patterns('', urlpatterns += patterns('',
@ -203,7 +203,7 @@ if helpdesk_settings.HELPDESK_KB_ENABLED:
urlpatterns += patterns('helpdesk.views.kb', urlpatterns += patterns('helpdesk.views.kb',
url(r'^kb/$', url(r'^kb/$',
'index', name='helpdesk_kb_index'), 'index', name='helpdesk_kb_index'),
url(r'^kb/(?P<item>[0-9]+)/$', url(r'^kb/(?P<item>[0-9]+)/$',
'item', name='helpdesk_kb_item'), 'item', name='helpdesk_kb_item'),
@ -215,13 +215,12 @@ if helpdesk_settings.HELPDESK_KB_ENABLED:
) )
urlpatterns += patterns('', urlpatterns += patterns('',
url(r'^api/$',TemplateView.as_view(template_name='helpdesk/help_api.html'), url(r'^api/$', TemplateView.as_view(template_name='helpdesk/help_api.html'),
name='helpdesk_api_help'), name='helpdesk_api_help'),
url(r'^help/context/$',TemplateView.as_view(template_name='helpdesk/help_context.html'), url(r'^help/context/$', TemplateView.as_view(template_name='helpdesk/help_context.html'),
name='helpdesk_help_context'), name='helpdesk_help_context'),
url(r'^system_settings/$',DirectTemplateView.as_view(template_name='helpdesk/system_settings.html', url(r'^system_settings/$', DirectTemplateView.as_view(template_name='helpdesk/system_settings.html'),
extra_context={'ADMIN_URL': getattr(settings, 'ADMIN_URL', '/admin/')}), name='helpdesk_system_settings'),
name='helpdesk_system_settings'),
) )