holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-28 01:28:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from issackelly/master

Browse Source 
Custom User model changes.Also closes #221. Thanks!
This commit is contained in:
Ross Poulton 2014-07-16 13:54:41 +10:00
commit 3bd2d67193
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/settings.rst
View File

@ -86,6 +86,10 @@ These changes are visible throughout django-helpdesk
**Default:** ``HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE = False`` **Default:** ``HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE = False``
- **HELPDESK_EMAIL_SUBJECT_TEMPLATE ** Subject template for templated emails. ``%(subject)s`` represents the subject wording from the email template (e.g. "(Closed)").
**Default:** ``HELPDESK_EMAIL_SUBJECT_TEMPLATE = "{{ ticket.ticket }} {{ ticket.title|safe }} %(subject)s"``
Options shown on public pages Options shown on public pages
----------------------------- -----------------------------

5
helpdesk/lib.py
View File

@ -104,8 +104,9 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
).render(context) ).render(context)
subject_part = loader.get_template_from_string( subject_part = loader.get_template_from_string(
"{{ ticket.ticket }} {{ ticket.title|safe }} %s" % t.subject settings.HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
).render(context) "subject": t.subject,
}).render(context)
if isinstance(recipients,(str,unicode)): if isinstance(recipients,(str,unicode)):
if recipients.find(','): if recipients.find(','):

3
helpdesk/settings.py
View File

@ -80,6 +80,9 @@ HELPDESK_STAFF_ONLY_TICKET_OWNERS = getattr(settings, 'HELPDESK_STAFF_ONLY_TICKE
HELPDESK_STAFF_ONLY_TICKET_CC = getattr(settings, 'HELPDESK_STAFF_ONLY_TICKET_CC', False) HELPDESK_STAFF_ONLY_TICKET_CC = getattr(settings, 'HELPDESK_STAFF_ONLY_TICKET_CC', False)
# allow the subject to have a configurable template.
HELPDESK_EMAIL_SUBJECT_TEMPLATE = getattr(settings, 'HELPDESK_EMAIL_SUBJECT_TEMPLATE', "{{ ticket.ticket }} {{ ticket.title|safe }} %(subject)s")
''' options for staff.create_ticket view ''' ''' options for staff.create_ticket view '''
# hide the 'assigned to' / 'Case owner' field from the 'create_ticket' view? # hide the 'assigned to' / 'Case owner' field from the 'create_ticket' view?

4
helpdesk/urls.py
View File

@ -160,11 +160,11 @@ urlpatterns += patterns('helpdesk.views.public',
) )
urlpatterns += patterns('', urlpatterns += patterns('',
url(r'^rss/user/(?P<user_name>[\.\@A-Za-z0-9_-]+)/$', url(r'^rss/user/(?P<user_name>[^/]+)/$',
login_required(feeds.OpenTicketsByUser()), login_required(feeds.OpenTicketsByUser()),
name='helpdesk_rss_user'), name='helpdesk_rss_user'),
url(r'^rss/user/(?P<user_name>[\.\@A-Za-z0-9_-]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$', url(r'^rss/user/(?P<user_name>[^/]+)/(?P<queue_slug>[A-Za-z0-9_-]+)/$',
login_required(feeds.OpenTicketsByUser()), login_required(feeds.OpenTicketsByUser()),
name='helpdesk_rss_user_queue'), name='helpdesk_rss_user_queue'),

4
helpdesk/views/staff.py
View File

@ -237,9 +237,9 @@ def view_ticket(request, ticket_id):
return update_ticket(request, ticket_id) return update_ticket(request, ticket_id)
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS: if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS:
users = User.objects.filter(is_active=True, is_staff=True).order_by('username') users = User.objects.filter(is_active=True, is_staff=True).order_by(User.USERNAME_FIELD)
else: else:
users = User.objects.filter(is_active=True).order_by('username') users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
# TODO: shouldn't this template get a form to begin with? # TODO: shouldn't this template get a form to begin with?