holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-22 16:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replacing undocumented ADMIN_URL setting

Browse Source
This commit is contained in:
Stefano Brentegani 2012-04-20 00:02:28 +02:00
parent 4fb9ab0617
commit 71dcfb6f37
2 changed files with 11 additions and 16 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 %}

13
helpdesk/urls.py
View File

@ -80,7 +80,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'),
@ -137,7 +137,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('',
@ -165,7 +165,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'),
@ -189,11 +189,6 @@ urlpatterns += patterns('',
url(r'^system_settings/$', url(r'^system_settings/$',
'django.views.generic.simple.direct_to_template', 'django.views.generic.simple.direct_to_template',
{ {'template': 'helpdesk/system_settings.html',},
'template': 'helpdesk/system_settings.html',
'extra_context': {
'ADMIN_URL': getattr(settings, 'ADMIN_URL', '/admin/'),
},
},
name='helpdesk_system_settings'), name='helpdesk_system_settings'),
) )