Added ability to turn of KB (my business doesn't need it)

This commit is contained in:
Joshua Jonah 2011-06-09 11:24:33 -04:00
parent 9cad876f71
commit e73f45e4f6
4 changed files with 55 additions and 46 deletions

View File

@ -27,3 +27,6 @@ if type(DEFAULT_USER_SETTINGS) != type(dict()):
'email_on_ticket_apichange': True, 'email_on_ticket_apichange': True,
'tickets_per_page': 25 'tickets_per_page': 25
} }
# show knowledgebase links?
HELPDESK_KB_ENABLED = getattr(settings, 'HELPDESK_KB_ENABLED', True)

View File

@ -1,6 +1,6 @@
{% load i18n %} {% load i18n %}
{% if user.is_staff %} {% if user.is_staff %}
<ul id="dropdown"> <ul id="dropdown">
<li><a href='{% url helpdesk_dashboard %}'>{% trans "Dashboard" %}</a></li> <li><a href='{% url helpdesk_dashboard %}'>{% trans "Dashboard" %}</a></li>
<li><a href='{% url helpdesk_list %}'>{% trans "Tickets" %}</a></li> <li><a href='{% url helpdesk_list %}'>{% trans "Tickets" %}</a></li>
<li><a href='{% url helpdesk_submit %}'>{% trans "New Ticket" %}</a></li> <li><a href='{% url helpdesk_submit %}'>{% trans "New Ticket" %}</a></li>
@ -19,11 +19,11 @@
{% endif %} {% endif %}
<li><a href='{% url logout %}'>{% trans "Logout" %}</a></li> <li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
{% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />{% csrf_token %}</form></li>{% endif %} {% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />{% csrf_token %}</form></li>{% endif %}
</ul> </ul>
{% else %} {% else %}
<ul> <ul>
<li><a href='{% url helpdesk_home %}'>{% trans "Submit A Ticket" %}</a></li> <li><a href='{% url helpdesk_home %}'>{% trans "Submit A Ticket" %}</a></li>
<li><a href='{% url helpdesk_kb_index %}'>{% trans "Knowledgebase" %}</a></li> {% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url helpdesk_kb_index %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
<li><a href='{% url login %}?next={% url helpdesk_dashboard %}'>{% trans "Log In" %}</a></li> <li><a href='{% url login %}?next={% url helpdesk_dashboard %}'>{% trans "Log In" %}</a></li>
</ul> </ul>
{% endif %} {% endif %}

View File

@ -12,8 +12,10 @@ from django.conf.urls.defaults import *
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.syndication.views import feed as django_feed 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.feeds import feed_setup
urlpatterns = patterns('helpdesk.views.staff', urlpatterns = patterns('helpdesk.views.staff',
url(r'^dashboard/$', url(r'^dashboard/$',
'dashboard', 'dashboard',
@ -151,7 +153,8 @@ urlpatterns += patterns('',
name='logout'), name='logout'),
) )
urlpatterns += patterns('helpdesk.views.kb', if helpdesk_settings.HELPDESK_KB_ENABLED:
urlpatterns += patterns('helpdesk.views.kb',
url(r'^kb/$', url(r'^kb/$',
'index', name='helpdesk_kb_index'), 'index', name='helpdesk_kb_index'),
@ -163,7 +166,7 @@ urlpatterns += patterns('helpdesk.views.kb',
url(r'^kb/(?P<item>[0-9]+)/vote/$', url(r'^kb/(?P<item>[0-9]+)/vote/$',
'vote', name='helpdesk_kb_vote'), 'vote', name='helpdesk_kb_vote'),
) )
urlpatterns += patterns('', urlpatterns += patterns('',
url(r'^api/$', url(r'^api/$',

View File

@ -15,6 +15,7 @@ from django.shortcuts import render_to_response, get_object_or_404
from django.template import loader, Context, RequestContext from django.template import loader, Context, RequestContext
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from helpdesk import settings as helpdesk_settings
from helpdesk.forms import PublicTicketForm from helpdesk.forms import PublicTicketForm
from helpdesk.lib import send_templated_mail, text_is_spam from helpdesk.lib import send_templated_mail, text_is_spam
from helpdesk.models import Ticket, Queue, UserSettings from helpdesk.models import Ticket, Queue, UserSettings
@ -62,6 +63,7 @@ def homepage(request):
return render_to_response('helpdesk/public_homepage.html', return render_to_response('helpdesk/public_homepage.html',
RequestContext(request, { RequestContext(request, {
'form': form, 'form': form,
'helpdesk_settings': helpdesk_settings,
})) }))
@ -116,5 +118,6 @@ def view_ticket(request):
'ticket': ticket, 'ticket': ticket,
'email': email, 'email': email,
'error_message': error_message, 'error_message': error_message,
'helpdesk_settings': helpdesk_settings,
})) }))