From d2ac8af6c0d894af26134be5a4e189f4935a37ee Mon Sep 17 00:00:00 2001 From: Tom Graham Date: Wed, 22 Oct 2014 16:18:04 +1100 Subject: [PATCH 01/35] Improved support for custom user models Support for custom user models with a non-standard username field --- helpdesk/forms.py | 4 ++-- helpdesk/models.py | 2 +- helpdesk/templates/helpdesk/base.html | 2 +- helpdesk/templates/helpdesk/navigation.html | 4 ++-- helpdesk/templates/helpdesk/rss_list.html | 4 ++-- helpdesk/templates/helpdesk/ticket_list.html | 6 +++--- helpdesk/tests/navigation.py | 2 +- helpdesk/views/api.py | 2 +- helpdesk/views/feeds.py | 14 +++++++------- helpdesk/views/staff.py | 14 +++++++------- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index eb0dde3f..423a3781 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -529,9 +529,9 @@ class TicketCCForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(TicketCCForm, self).__init__(*args, **kwargs) if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC: - 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: - users = User.objects.filter(is_active=True).order_by('username') + users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD) self.fields['user'].queryset = users class Meta: model = TicketCC diff --git a/helpdesk/models.py b/helpdesk/models.py index 453b337d..cbd42e5d 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -351,7 +351,7 @@ class Ticket(models.Model): if self.assigned_to.get_full_name(): return self.assigned_to.get_full_name() else: - return self.assigned_to.username + return self.assigned_to.get_username() get_assigned_to = property(_get_assigned_to) def _get_ticket(self): diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index 9ef38d9c..71ad129e 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -17,7 +17,7 @@ - + diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html index 59bc3f0d..ff3fae31 100644 --- a/helpdesk/templates/helpdesk/navigation.html +++ b/helpdesk/templates/helpdesk/navigation.html @@ -26,13 +26,13 @@ {% for q in user_saved_queries_ %}
  • {{ q.title }} {% if q.shared %} - (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %}) + (Shared{% ifnotequal user q.user %} by {{ q.user.get_username }}{% endifnotequal %}) {% endif %}
    • {% endfor %} {% endif %} -
  • {{ user.get_full_name|default:user.username }} +
  • {{ user.get_full_name|default:user.get_username }} {% endblock %} diff --git a/helpdesk/templatetags/user_admin_url.py b/helpdesk/templatetags/user_admin_url.py new file mode 100644 index 00000000..fb7bc95a --- /dev/null +++ b/helpdesk/templatetags/user_admin_url.py @@ -0,0 +1,22 @@ +""" +django-helpdesk - A Django powered ticket tracker for small enterprise. + +(c) Copyright 2008 Jutda. All Rights Reserved. See LICENSE for details. + +templatetags/admin_url.py - Very simple template tag allow linking to the + right auth user model urls. + +{% url 'changelist'|user_admin_url %} +""" + +from django import template +from django.contrib.auth import get_user_model + +def user_admin_url(action): + user = get_user_model() + return 'admin:%s_%s_%s' % ( + user._meta.app_label, user._meta.model_name, + action) + +register = template.Library() +register.filter(user_admin_urlname) From 15feb7def374638b2a92588f1a2a90dfcb3f4894 Mon Sep 17 00:00:00 2001 From: Tom Graham Date: Wed, 22 Oct 2014 17:32:17 +1100 Subject: [PATCH 03/35] Typo in previous commit --- helpdesk/templatetags/user_admin_url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/templatetags/user_admin_url.py b/helpdesk/templatetags/user_admin_url.py index fb7bc95a..783ad510 100644 --- a/helpdesk/templatetags/user_admin_url.py +++ b/helpdesk/templatetags/user_admin_url.py @@ -19,4 +19,4 @@ def user_admin_url(action): action) register = template.Library() -register.filter(user_admin_urlname) +register.filter(user_admin_url) From eef2a66f23397b69cc0350d0c34595d3a5413b46 Mon Sep 17 00:00:00 2001 From: Tom Graham Date: Wed, 22 Oct 2014 17:35:24 +1100 Subject: [PATCH 04/35] Fix for no model_name in django < 1.6 --- helpdesk/templatetags/user_admin_url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/templatetags/user_admin_url.py b/helpdesk/templatetags/user_admin_url.py index 783ad510..5a62f0bd 100644 --- a/helpdesk/templatetags/user_admin_url.py +++ b/helpdesk/templatetags/user_admin_url.py @@ -15,7 +15,7 @@ from django.contrib.auth import get_user_model def user_admin_url(action): user = get_user_model() return 'admin:%s_%s_%s' % ( - user._meta.app_label, user._meta.model_name, + user._meta.app_label, user._meta.module_name.lower(), action) register = template.Library() From 1aed6c9a967a91d724b3efdfdcd4e84b3070fc62 Mon Sep 17 00:00:00 2001 From: Tom Graham Date: Fri, 24 Oct 2014 17:56:52 +1100 Subject: [PATCH 05/35] Make sure custom user logic works with Django 1.4 Monkey Patch for Django 1.4 to allow new custom user model logic. --- helpdesk/__init__.py | 1 + helpdesk/monkey_patch.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 helpdesk/monkey_patch.py diff --git a/helpdesk/__init__.py b/helpdesk/__init__.py index e69de29b..ca49be81 100644 --- a/helpdesk/__init__.py +++ b/helpdesk/__init__.py @@ -0,0 +1 @@ +import monkey_patch # Patch User model for older versions of Django diff --git a/helpdesk/monkey_patch.py b/helpdesk/monkey_patch.py new file mode 100644 index 00000000..5f729911 --- /dev/null +++ b/helpdesk/monkey_patch.py @@ -0,0 +1,15 @@ +""" +django-helpdesk - A Django powered ticket tracker for small enterprise. + +(c) Copyright 2008 Jutda. All Rights Reserved. See LICENSE for details. + +monkey_patch.py - Monkey Patch the User model for older versions of +Django that don't support USERNAME_FIELD and get_username +""" + +from django.contrib.auth import get_user_model +User = get_user_model() +if not hasattr(User, "USERNAME_FIELD"): + User.add_to_class("USERNAME_FIELD", "username") +if not hasattr(User, "get_username"): + User.add_to_class("get_username", lambda self: getattr(self, self.USERNAME_FIELD)) From 33728bc0b1e849da1ce248d7ee8afcfb7738d416 Mon Sep 17 00:00:00 2001 From: Tom Graham Date: Fri, 24 Oct 2014 18:05:44 +1100 Subject: [PATCH 06/35] Revert "Make sure custom user logic works with Django 1.4" This reverts commit 1aed6c9a967a91d724b3efdfdcd4e84b3070fc62. --- helpdesk/__init__.py | 1 - helpdesk/monkey_patch.py | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 helpdesk/monkey_patch.py diff --git a/helpdesk/__init__.py b/helpdesk/__init__.py index ca49be81..e69de29b 100644 --- a/helpdesk/__init__.py +++ b/helpdesk/__init__.py @@ -1 +0,0 @@ -import monkey_patch # Patch User model for older versions of Django diff --git a/helpdesk/monkey_patch.py b/helpdesk/monkey_patch.py deleted file mode 100644 index 5f729911..00000000 --- a/helpdesk/monkey_patch.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -django-helpdesk - A Django powered ticket tracker for small enterprise. - -(c) Copyright 2008 Jutda. All Rights Reserved. See LICENSE for details. - -monkey_patch.py - Monkey Patch the User model for older versions of -Django that don't support USERNAME_FIELD and get_username -""" - -from django.contrib.auth import get_user_model -User = get_user_model() -if not hasattr(User, "USERNAME_FIELD"): - User.add_to_class("USERNAME_FIELD", "username") -if not hasattr(User, "get_username"): - User.add_to_class("get_username", lambda self: getattr(self, self.USERNAME_FIELD)) From f1147f695a2a76a9220e1add002b2f8775d48a38 Mon Sep 17 00:00:00 2001 From: Vladyslav T Date: Sat, 25 Oct 2014 22:53:56 +0300 Subject: [PATCH 07/35] Fix replace function for custom fields --- helpdesk/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index da46bc31..ba22c232 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -102,7 +102,7 @@ class EditTicketForm(CustomFieldMixin, forms.ModelForm): for field, value in self.cleaned_data.items(): if field.startswith('custom_'): - field_name = field.replace('custom_', '') + field_name = field.replace('custom_', '', 1) customfield = CustomField.objects.get(name=field_name) try: cfv = TicketCustomFieldValue.objects.get(ticket=self.instance, field=customfield) @@ -229,7 +229,7 @@ class TicketForm(CustomFieldMixin, forms.Form): for field, value in self.cleaned_data.items(): if field.startswith('custom_'): - field_name = field.replace('custom_', '') + field_name = field.replace('custom_', '', 1) customfield = CustomField.objects.get(name=field_name) cfv = TicketCustomFieldValue(ticket=t, field=customfield, @@ -407,7 +407,7 @@ class PublicTicketForm(CustomFieldMixin, forms.Form): for field, value in self.cleaned_data.items(): if field.startswith('custom_'): - field_name = field.replace('custom_', '') + field_name = field.replace('custom_', '', 1) customfield = CustomField.objects.get(name=field_name) cfv = TicketCustomFieldValue(ticket=t, field=customfield, From 859935e5ee48f18f80ea15666738ae9d0d46ba17 Mon Sep 17 00:00:00 2001 From: Jenny Qian Date: Wed, 29 Oct 2014 10:57:31 -0500 Subject: [PATCH 08/35] exclude '\r' from subject_part This is to prevent BadHeaderError("Header values can't contain newlines.. --- helpdesk/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/lib.py b/helpdesk/lib.py index 5d90c8cb..22ef1a44 100644 --- a/helpdesk/lib.py +++ b/helpdesk/lib.py @@ -115,7 +115,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b elif type(recipients) != list: recipients = [recipients,] - msg = EmailMultiAlternatives( subject_part.replace('\n', ''), + msg = EmailMultiAlternatives( subject_part.replace('\n', '').replace('\r', ''), text_part, sender, recipients, From 68cc1b1e8ed4c2256268809361f9da02c380f1f8 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Fri, 21 Nov 2014 13:00:37 +1100 Subject: [PATCH 09/35] Fix esclation description Escalation is based on days a ticket has been active, not hours. Fixed config, closes #280. Thanks @J-A-M --- docs/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 0ab6d6f5..6a4b9c81 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -23,7 +23,7 @@ Before django-helpdesk will be much use, you need to do some basic configuration 0 * * * * /path/to/helpdesksite/manage.py escalate_tickets - This will run the escalation process hourly, using the 'Escalation Hours' setting for each queue to determine which tickets to escalate. + This will run the escalation process hourly, using the 'Escalation Days' setting for each queue to determine which tickets to escalate. 5. If you wish to exclude some days (eg, weekends) from escalation calculations, enter the dates manually via the Admin, or setup a cronjob to run a management command on a regular basis:: From d6cee6cfe415906b83fda82c6b3ab76e5cc7d87c Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Mon, 8 Dec 2014 09:07:54 +1100 Subject: [PATCH 10/35] Bump version for pypi release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ec771427..23c1cc9c 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.1.12' +version = '0.1.13' # Provided as an attribute, so you can append to these instead # of replicating them: From 150fd1b5bc9afe2dac69b47ba2fc7fb2bcc8b4b9 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Wed, 10 Dec 2014 09:19:07 +1100 Subject: [PATCH 11/35] Fix dist by adding requirements.txt --- MANIFEST.in | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index c62f8817..d277e6cb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,7 @@ include README include UPGRADE include LICENSE* include CHANGELOG +include requirements.txt recursive-include helpdesk/static/helpdesk * recursive-include helpdesk/locale *.po *.mo diff --git a/setup.py b/setup.py index 23c1cc9c..bc5ad34f 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.1.13' +version = '0.1.14' # Provided as an attribute, so you can append to these instead # of replicating them: From 50b80b2a084fe9ca2da0268f631be7a88cfd82e6 Mon Sep 17 00:00:00 2001 From: TreeNode Date: Wed, 10 Dec 2014 23:37:34 +0200 Subject: [PATCH 12/35] Socks proxy support --- helpdesk/management/commands/get_email.py | 13 +++++++++++++ helpdesk/migrations/0001_initial.py | 4 ++++ helpdesk/models.py | 23 +++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 8d4fede6..33dcc27c 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -15,6 +15,8 @@ import imaplib import mimetypes import poplib import re +import socks +import socket from datetime import timedelta from email.header import decode_header @@ -84,6 +86,17 @@ def process_queue(q, quiet=False): if not quiet: print "Processing: %s" % q + if q.socks_proxy_type and q.socks_proxy_host and q.socks_proxy_port: + proxy_type = { + 'socks4': socks.SOCKS4, + 'socks5': socks.SOCKS5, + }.get(q.socks_proxy_type) + + socks.set_default_proxy(proxy_type=proxy_type, addr=q.socks_proxy_host, port=q.socks_proxy_port) + socket.socket = socks.socksocket + else: + socket.socket = socket._socketobject + email_box_type = settings.QUEUE_EMAIL_BOX_TYPE if settings.QUEUE_EMAIL_BOX_TYPE else q.email_box_type if email_box_type == 'pop3': diff --git a/helpdesk/migrations/0001_initial.py b/helpdesk/migrations/0001_initial.py index dfd93b4b..80b3dccc 100644 --- a/helpdesk/migrations/0001_initial.py +++ b/helpdesk/migrations/0001_initial.py @@ -185,6 +185,10 @@ class Migration(migrations.Migration): ('email_box_imap_folder', models.CharField(help_text='If using IMAP, what folder do you wish to fetch messages from? This allows you to use one IMAP account for multiple queues, by filtering messages on your IMAP server into separate folders. Default: INBOX.', max_length=100, null=True, verbose_name='IMAP Folder', blank=True)), ('email_box_interval', models.IntegerField(default=b'5', help_text='How often do you wish to check this mailbox? (in Minutes)', null=True, verbose_name='E-Mail Check Interval', blank=True)), ('email_box_last_check', models.DateTimeField(null=True, editable=False, blank=True)), + ('socks_proxy_type', models.CharField(choices=[(b'socks4', 'SOCKS4'), (b'socks5', 'SOCKS5')], max_length=8, blank=True, help_text='SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server', null=True, verbose_name='Socks Proxy Type')), + ('socks_proxy_host', models.GenericIPAddressField(blank=True, help_text='Socks proxy IP address.', null=True, verbose_name='Socks Proxy Host')), + ('socks_proxy_port', models.IntegerField(blank=True, help_text='Socks proxy port number.', null=True, verbose_name='Socks Proxy Port')), + ], options={ 'ordering': ('title',), diff --git a/helpdesk/models.py b/helpdesk/models.py index cbd42e5d..13b188f0 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -178,6 +178,29 @@ class Queue(models.Model): # This is updated by management/commands/get_mail.py. ) + socks_proxy_type = models.CharField( + _('Socks Proxy Type'), + max_length=8, + choices=(('socks4', _('SOCKS4')), ('socks5', _('SOCKS5'))), + blank=True, + null=True, + help_text=_('SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server.'), + ) + + socks_proxy_host = models.GenericIPAddressField( + _('Socks Proxy Host'), + blank=True, + null=True, + help_text=_('Socks proxy IP address.'), + ) + + socks_proxy_port = models.IntegerField( + _('Socks Proxy Port'), + blank=True, + null=True, + help_text=_('Socks proxy port number.'), + ) + def __unicode__(self): return u"%s" % self.title From 97e0f757234e40def0d5a24d289400f8715dbdc0 Mon Sep 17 00:00:00 2001 From: Ashot Seropian Date: Wed, 10 Dec 2014 23:42:59 +0200 Subject: [PATCH 13/35] PySocks for socks proxy support --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 369d90a8..d6a1da34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ django-bootstrap-form>=3.1,<4 email-reply-parser django-markdown-deux simplejson +PySocks From 83a5e964f368a658daade46a14e40cccef16a4a8 Mon Sep 17 00:00:00 2001 From: TreeNode Date: Thu, 11 Dec 2014 01:42:20 +0200 Subject: [PATCH 14/35] Default field values --- helpdesk/models.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/helpdesk/models.py b/helpdesk/models.py index 13b188f0..be318a58 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -191,14 +191,14 @@ class Queue(models.Model): _('Socks Proxy Host'), blank=True, null=True, - help_text=_('Socks proxy IP address.'), + help_text=_('Socks proxy IP address. Default: 127.0.0.1'), ) socks_proxy_port = models.IntegerField( _('Socks Proxy Port'), blank=True, null=True, - help_text=_('Socks proxy port number.'), + help_text=_('Socks proxy port number. Default: 9150 (default TOR port)'), ) def __unicode__(self): @@ -225,6 +225,12 @@ class Queue(models.Model): if self.email_box_type == 'imap' and not self.email_box_imap_folder: self.email_box_imap_folder = 'INBOX' + if self.socks_proxy_type: + if not self.socks_proxy_host: + self.socks_proxy_host = '127.0.0.1' + if not self.socks_proxy_port: + self.socks_proxy_port = 9150 + if not self.email_box_port: if self.email_box_type == 'imap' and self.email_box_ssl: self.email_box_port = 993 From 135e2d65ea85fc9e05e9a97690a024b27f808085 Mon Sep 17 00:00:00 2001 From: TreeNode Date: Thu, 11 Dec 2014 01:42:55 +0200 Subject: [PATCH 15/35] Created new migrations --- helpdesk/migrations/0001_initial.py | 4 ---- helpdesk/migrations/0002_socks_proxy.py | 32 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 helpdesk/migrations/0002_socks_proxy.py diff --git a/helpdesk/migrations/0001_initial.py b/helpdesk/migrations/0001_initial.py index 80b3dccc..dfd93b4b 100644 --- a/helpdesk/migrations/0001_initial.py +++ b/helpdesk/migrations/0001_initial.py @@ -185,10 +185,6 @@ class Migration(migrations.Migration): ('email_box_imap_folder', models.CharField(help_text='If using IMAP, what folder do you wish to fetch messages from? This allows you to use one IMAP account for multiple queues, by filtering messages on your IMAP server into separate folders. Default: INBOX.', max_length=100, null=True, verbose_name='IMAP Folder', blank=True)), ('email_box_interval', models.IntegerField(default=b'5', help_text='How often do you wish to check this mailbox? (in Minutes)', null=True, verbose_name='E-Mail Check Interval', blank=True)), ('email_box_last_check', models.DateTimeField(null=True, editable=False, blank=True)), - ('socks_proxy_type', models.CharField(choices=[(b'socks4', 'SOCKS4'), (b'socks5', 'SOCKS5')], max_length=8, blank=True, help_text='SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server', null=True, verbose_name='Socks Proxy Type')), - ('socks_proxy_host', models.GenericIPAddressField(blank=True, help_text='Socks proxy IP address.', null=True, verbose_name='Socks Proxy Host')), - ('socks_proxy_port', models.IntegerField(blank=True, help_text='Socks proxy port number.', null=True, verbose_name='Socks Proxy Port')), - ], options={ 'ordering': ('title',), diff --git a/helpdesk/migrations/0002_socks_proxy.py b/helpdesk/migrations/0002_socks_proxy.py new file mode 100644 index 00000000..468af823 --- /dev/null +++ b/helpdesk/migrations/0002_socks_proxy.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('helpdesk', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='queue', + name='socks_proxy_host', + field=models.GenericIPAddressField(help_text='Socks proxy IP address. Default: 127.0.0.1', null=True, verbose_name='Socks Proxy Host', blank=True), + preserve_default=True, + ), + migrations.AddField( + model_name='queue', + name='socks_proxy_port', + field=models.IntegerField(help_text='Socks proxy port number. Default: 9150 (default TOR port)', null=True, verbose_name='Socks Proxy Port', blank=True), + preserve_default=True, + ), + migrations.AddField( + model_name='queue', + name='socks_proxy_type', + field=models.CharField(choices=[(b'socks4', 'SOCKS4'), (b'socks5', 'SOCKS5')], max_length=8, blank=True, help_text='SOCKS4 or SOCKS5 allows you to proxy your connections through a SOCKS server.', null=True, verbose_name='Socks Proxy Type'), + preserve_default=True, + ), + ] From aea8ff35a61a7fd46ce8dc2fc2476ca6efb378f6 Mon Sep 17 00:00:00 2001 From: TreeNode Date: Thu, 11 Dec 2014 01:43:54 +0200 Subject: [PATCH 16/35] PySocks removed from requirements and doc update --- docs/configuration.rst | 2 ++ requirements.txt | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 6a4b9c81..d9a67b29 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -39,4 +39,6 @@ Before django-helpdesk will be much use, you need to do some basic configuration EMAIL_HOST_USER = 'YYYYYY@ZZZZ.PPP' EMAIL_HOST_PASSWORD = '123456' +8. If you wish to use SOCKS4/5 proxy with Helpdesk Queue email operations, install PySocks manually. + You're now up and running! Happy ticketing. diff --git a/requirements.txt b/requirements.txt index d6a1da34..369d90a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ django-bootstrap-form>=3.1,<4 email-reply-parser django-markdown-deux simplejson -PySocks From 54dd376b9cc2682a05eb0940c7f147d16c14864e Mon Sep 17 00:00:00 2001 From: TreeNode Date: Thu, 11 Dec 2014 01:44:47 +0200 Subject: [PATCH 17/35] Check for sock lib has installed --- helpdesk/management/commands/get_email.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 33dcc27c..e6a3b124 100644 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -15,7 +15,6 @@ import imaplib import mimetypes import poplib import re -import socks import socket from datetime import timedelta @@ -87,6 +86,11 @@ def process_queue(q, quiet=False): print "Processing: %s" % q if q.socks_proxy_type and q.socks_proxy_host and q.socks_proxy_port: + try: + import socks + except ImportError: + raise ImportError("Queue has been configured with proxy settings, but no socks library was installed. Try to install PySocks via pypi.") + proxy_type = { 'socks4': socks.SOCKS4, 'socks5': socks.SOCKS5, From ae681dd5d38a21b3fcd3e4585734d12aa3b488a6 Mon Sep 17 00:00:00 2001 From: TreeNode Date: Thu, 11 Dec 2014 12:03:36 +0200 Subject: [PATCH 18/35] Clear host and port if no proxy type was set --- helpdesk/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helpdesk/models.py b/helpdesk/models.py index be318a58..44a69b89 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -230,6 +230,9 @@ class Queue(models.Model): self.socks_proxy_host = '127.0.0.1' if not self.socks_proxy_port: self.socks_proxy_port = 9150 + else: + self.socks_proxy_host = None + self.socks_proxy_port = None if not self.email_box_port: if self.email_box_type == 'imap' and self.email_box_ssl: From f0156cfcb3ca0337ed3fea556a814c566269d6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 11:15:45 +0100 Subject: [PATCH 19/35] Populate user settings w/ data migration, Django1.7 compatible, fix #276 --- .../migrations/0003_populate_usersettings.py | 50 +++++++++++++++++++ helpdesk/models.py | 22 ++------ 2 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 helpdesk/migrations/0003_populate_usersettings.py diff --git a/helpdesk/migrations/0003_populate_usersettings.py b/helpdesk/migrations/0003_populate_usersettings.py new file mode 100644 index 00000000..ebf57a8b --- /dev/null +++ b/helpdesk/migrations/0003_populate_usersettings.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.contrib.auth import get_user_model +from django.db import models, migrations + +from helpdesk.settings import DEFAULT_USER_SETTINGS + + +def picke_settings(data): + """Pickling as defined at migration's creation time""" + import cPickle + from helpdesk.lib import b64encode + return b64encode(cPickle.dumps(data)) + + +# https://docs.djangoproject.com/en/1.7/topics/migrations/#data-migrations +def populate_usersettings(apps, schema_editor): + """Create a UserSettings entry for each existing user. + This will only happen once (at install time, or at upgrade) + when the UserSettings model doesn't already exist.""" + + _User = get_user_model() + User = apps.get_model(_User._meta.app_label, _User._meta.model_name) + + # Import historical version of models + UserSettings = apps.get_model("helpdesk", "UserSettings") + + settings_pickled = picke_settings(DEFAULT_USER_SETTINGS) + + for u in User.objects.all(): + try: + UserSettings.objects.get(user=u) + except UserSettings.DoesNotExist: + UserSettings.objects.create(user=u, settings_pickled=settings_pickled) + + +noop = lambda *args, **kwargs: None + +class Migration(migrations.Migration): + + dependencies = [ + ('helpdesk', '0002_socks_proxy'), + ] + + operations = [ + migrations.RunPython(populate_usersettings, reverse_code=noop), + ] + + diff --git a/helpdesk/models.py b/helpdesk/models.py index 44a69b89..1143e491 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -1027,7 +1027,7 @@ class UserSettings(models.Model): verbose_name_plural = _('User Settings') -def create_usersettings(sender, created_models=[], instance=None, created=False, **kwargs): +def create_usersettings(sender, instance, created, **kwargs): """ Helper function to create UserSettings instances as required, eg when we first create the UserSettings database @@ -1037,30 +1037,16 @@ def create_usersettings(sender, created_models=[], instance=None, created=False, 'DoesNotExist: UserSettings matching query does not exist.' errors. """ from helpdesk.settings import DEFAULT_USER_SETTINGS - if sender == settings.AUTH_USER_MODEL and created: - # This is a new user, so lets create their settings entry. - s, created = UserSettings.objects.get_or_create(user=instance, defaults={'settings': DEFAULT_USER_SETTINGS}) - s.save() - elif UserSettings in created_models: - User = get_user_model() - # We just created the UserSettings model, lets create a UserSettings - # entry for each existing user. This will only happen once (at install - # time, or at upgrade) when the UserSettings model doesn't already - # exist. - for u in User.objects.all(): - try: - s = UserSettings.objects.get(user=u) - except UserSettings.DoesNotExist: - s = UserSettings(user=u, settings=DEFAULT_USER_SETTINGS) - s.save() + if created: + UserSettings.objects.create(user=instance, settings=DEFAULT_USER_SETTINGS) -models.signals.post_syncdb.connect(create_usersettings) try: models.signals.post_save.connect(create_usersettings, sender=settings.AUTH_USER_MODEL) except: signal_user = get_user_model() models.signals.post_save.connect(create_usersettings, sender=signal_user) + class IgnoreEmail(models.Model): """ This model lets us easily ignore e-mails from certain senders when From afb0bd25b3681c00927c9a712a88cc54700be89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 14:10:09 +0100 Subject: [PATCH 20/35] Test fix: adding a django.setup() phase --- quicktest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/quicktest.py b/quicktest.py index f6aa9af6..528c3b3f 100644 --- a/quicktest.py +++ b/quicktest.py @@ -1,8 +1,11 @@ import os import sys import argparse + +import django from django.conf import settings + class QuickDjangoTest(object): """ A quick way to run the Django test suite without a fully-configured project. @@ -79,6 +82,8 @@ class QuickDjangoTest(object): INSTALLED_APPS = self.INSTALLED_APPS + self.apps, ROOT_URLCONF = self.apps[0] + '.urls', ) + django.setup() + from django.test.simple import DjangoTestSuiteRunner failures = DjangoTestSuiteRunner().run_tests(self.apps, verbosity=1) if failures: From f68c1b3ae9957abf19aef6e2353af3b51b3f6235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 15:36:37 +0100 Subject: [PATCH 21/35] Django1.7 tests: load initial_data w/ migration --- .../migrations/0004_initial_data_import.py | 44 +++++++++++++++++++ quicktest.py | 10 +++-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 helpdesk/migrations/0004_initial_data_import.py diff --git a/helpdesk/migrations/0004_initial_data_import.py b/helpdesk/migrations/0004_initial_data_import.py new file mode 100644 index 00000000..f3015cd9 --- /dev/null +++ b/helpdesk/migrations/0004_initial_data_import.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +import os +from sys import path + +from django.db import models, migrations +from django.core import serializers + +fixture_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../fixtures')) +fixture_filename = 'initial_data.json' + +def deserialize_fixture(): + fixture_file = os.path.join(fixture_dir, fixture_filename) + + with open(fixture_file, 'rb') as fixture: + return list(serializers.deserialize('json', fixture, ignorenonexistent=True)) + + +def load_fixture(apps, schema_editor): + objects = deserialize_fixture() + + for obj in objects: + obj.save() + + +def unload_fixture(apps, schema_editor): + "Delete all EmailTemplate objects" + + objects = deserialize_fixture() + + EmailTemplate = apps.get_model("helpdesk", "emailtemplate") + EmailTemplate.objects.filter(pk__in=[ obj.object.pk for obj in objects ]).delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('helpdesk', '0003_populate_usersettings'), + ] + + operations = [ + migrations.RunPython(load_fixture, reverse_code=unload_fixture), + ] diff --git a/quicktest.py b/quicktest.py index 528c3b3f..b251e5a6 100644 --- a/quicktest.py +++ b/quicktest.py @@ -28,6 +28,7 @@ class QuickDjangoTest(object): 'django.contrib.humanize', 'bootstrapform', ) + MIDDLEWARE_CLASSES = [] def __init__(self, *args, **kwargs): self.apps = args @@ -43,8 +44,7 @@ class QuickDjangoTest(object): """ Figure out which version of Django's test suite we have to play with. """ - from django import VERSION - if VERSION[0] == 1 and VERSION[1] >= 2: + if django.VERSION > (1, 2): return 'new' else: return 'old' @@ -67,6 +67,7 @@ class QuickDjangoTest(object): """ Fire up the Django test suite developed for version 1.2 """ + settings.configure( DEBUG = True, DATABASES = { @@ -80,9 +81,12 @@ class QuickDjangoTest(object): } }, INSTALLED_APPS = self.INSTALLED_APPS + self.apps, + MIDDLEWARE_CLASSES = self.MIDDLEWARE_CLASSES, ROOT_URLCONF = self.apps[0] + '.urls', ) - django.setup() + + if django.VERSION > (1, 7): + django.setup() from django.test.simple import DjangoTestSuiteRunner failures = DjangoTestSuiteRunner().run_tests(self.apps, verbosity=1) From b53d3ad9bc4b6561542dffd1bdf16e2a3cd59308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 15:49:08 +0100 Subject: [PATCH 22/35] Rename initial_data.json to emailtemplate.json --- .../{initial_data.json => emailtemplate.json} | 0 helpdesk/migrations/0004_initial_data_import.py | 2 +- quicktest.py | 12 +++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) rename helpdesk/fixtures/{initial_data.json => emailtemplate.json} (100%) diff --git a/helpdesk/fixtures/initial_data.json b/helpdesk/fixtures/emailtemplate.json similarity index 100% rename from helpdesk/fixtures/initial_data.json rename to helpdesk/fixtures/emailtemplate.json diff --git a/helpdesk/migrations/0004_initial_data_import.py b/helpdesk/migrations/0004_initial_data_import.py index f3015cd9..e64f4112 100644 --- a/helpdesk/migrations/0004_initial_data_import.py +++ b/helpdesk/migrations/0004_initial_data_import.py @@ -8,7 +8,7 @@ from django.db import models, migrations from django.core import serializers fixture_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../fixtures')) -fixture_filename = 'initial_data.json' +fixture_filename = 'emailtemplate.json' def deserialize_fixture(): fixture_file = os.path.join(fixture_dir, fixture_filename) diff --git a/quicktest.py b/quicktest.py index b251e5a6..458db8c3 100644 --- a/quicktest.py +++ b/quicktest.py @@ -28,7 +28,13 @@ class QuickDjangoTest(object): 'django.contrib.humanize', 'bootstrapform', ) - MIDDLEWARE_CLASSES = [] + MIDDLEWARE_CLASSES = [ + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + ] def __init__(self, *args, **kwargs): self.apps = args @@ -44,7 +50,7 @@ class QuickDjangoTest(object): """ Figure out which version of Django's test suite we have to play with. """ - if django.VERSION > (1, 2): + if django.VERSION >= (1, 2): return 'new' else: return 'old' @@ -85,7 +91,7 @@ class QuickDjangoTest(object): ROOT_URLCONF = self.apps[0] + '.urls', ) - if django.VERSION > (1, 7): + if django.VERSION >= (1, 7): django.setup() from django.test.simple import DjangoTestSuiteRunner From ed9dbbe42c04830bf398be15a96dabbb729bb602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 15:54:39 +0100 Subject: [PATCH 23/35] Blindly test if failure for django < 1.7 comes from middlewares --- quicktest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quicktest.py b/quicktest.py index 458db8c3..d49084b9 100644 --- a/quicktest.py +++ b/quicktest.py @@ -29,11 +29,12 @@ class QuickDjangoTest(object): 'bootstrapform', ) MIDDLEWARE_CLASSES = [ + 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] def __init__(self, *args, **kwargs): From 83affccec5120d327d1d1317f7d212cfe2ac09d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Wed, 14 Jan 2015 16:00:35 +0100 Subject: [PATCH 24/35] Specify features to load in failing testcase for django < 1.7 --- helpdesk/tests/ticket_submission.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpdesk/tests/ticket_submission.py b/helpdesk/tests/ticket_submission.py index 785f7ec1..e4779433 100644 --- a/helpdesk/tests/ticket_submission.py +++ b/helpdesk/tests/ticket_submission.py @@ -5,6 +5,8 @@ from django.test.client import Client from django.core.urlresolvers import reverse class TicketBasicsTestCase(TestCase): + fixtures = ['emailtemplate.json'] + def setUp(self): self.queue_public = Queue.objects.create(title='Queue 1', slug='q1', allow_public_submission=True, new_ticket_cc='new.public@example.com', updated_ticket_cc='update.public@example.com') self.queue_private = Queue.objects.create(title='Queue 2', slug='q2', allow_public_submission=False, new_ticket_cc='new.private@example.com', updated_ticket_cc='update.private@example.com') From fffb2d5eaf5659247143a430f247067139346db1 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Thu, 15 Jan 2015 09:04:42 +1100 Subject: [PATCH 25/35] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc5ad34f..82fadd5e 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.1.14' +version = '0.1.15' # Provided as an attribute, so you can append to these instead # of replicating them: From a87e1355eef831a865f9bebc6d7d5b43daa20044 Mon Sep 17 00:00:00 2001 From: Alex Seeholzer Date: Tue, 10 Feb 2015 17:30:32 +0100 Subject: [PATCH 26/35] Added missing south migration, adding the missing fields 'helpdesk_queue.socks_proxytype'. This fixes rossp/django-helpdesk#291. --- ...xy_type__add_field_queue_socks_proxy_ho.py | 249 ++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 helpdesk/south_migrations/0010_auto__add_field_queue_socks_proxy_type__add_field_queue_socks_proxy_ho.py diff --git a/helpdesk/south_migrations/0010_auto__add_field_queue_socks_proxy_type__add_field_queue_socks_proxy_ho.py b/helpdesk/south_migrations/0010_auto__add_field_queue_socks_proxy_type__add_field_queue_socks_proxy_ho.py new file mode 100644 index 00000000..62317cc7 --- /dev/null +++ b/helpdesk/south_migrations/0010_auto__add_field_queue_socks_proxy_type__add_field_queue_socks_proxy_ho.py @@ -0,0 +1,249 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Queue.socks_proxy_type' + db.add_column(u'helpdesk_queue', 'socks_proxy_type', + self.gf('django.db.models.fields.CharField')(max_length=8, null=True, blank=True), + keep_default=False) + + # Adding field 'Queue.socks_proxy_host' + db.add_column(u'helpdesk_queue', 'socks_proxy_host', + self.gf('django.db.models.fields.GenericIPAddressField')(max_length=39, null=True, blank=True), + keep_default=False) + + # Adding field 'Queue.socks_proxy_port' + db.add_column(u'helpdesk_queue', 'socks_proxy_port', + self.gf('django.db.models.fields.IntegerField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Queue.socks_proxy_type' + db.delete_column(u'helpdesk_queue', 'socks_proxy_type') + + # Deleting field 'Queue.socks_proxy_host' + db.delete_column(u'helpdesk_queue', 'socks_proxy_host') + + # Deleting field 'Queue.socks_proxy_port' + db.delete_column(u'helpdesk_queue', 'socks_proxy_port') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'helpdesk.attachment': { + 'Meta': {'ordering': "['filename']", 'object_name': 'Attachment'}, + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1000'}), + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'followup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.FollowUp']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'size': ('django.db.models.fields.IntegerField', [], {}) + }, + u'helpdesk.customfield': { + 'Meta': {'object_name': 'CustomField'}, + 'data_type': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'decimal_places': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'empty_selection_list': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'help_text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': "'30'"}), + 'list_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'max_length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'ordering': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'staff_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + u'helpdesk.emailtemplate': { + 'Meta': {'ordering': "['template_name', 'locale']", 'object_name': 'EmailTemplate'}, + 'heading': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'html': ('django.db.models.fields.TextField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'locale': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'plain_text': ('django.db.models.fields.TextField', [], {}), + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'helpdesk.escalationexclusion': { + 'Meta': {'object_name': 'EscalationExclusion'}, + 'date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'queues': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['helpdesk.Queue']", 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.followup': { + 'Meta': {'ordering': "['date']", 'object_name': 'FollowUp'}, + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_status': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.Ticket']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.ignoreemail': { + 'Meta': {'object_name': 'IgnoreEmail'}, + 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}), + 'email_address': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'keep_in_mailbox': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'queues': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['helpdesk.Queue']", 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.kbcategory': { + 'Meta': {'ordering': "['title']", 'object_name': 'KBCategory'}, + 'description': ('django.db.models.fields.TextField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'helpdesk.kbitem': { + 'Meta': {'ordering': "['title']", 'object_name': 'KBItem'}, + 'answer': ('django.db.models.fields.TextField', [], {}), + 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.KBCategory']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_updated': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), + 'question': ('django.db.models.fields.TextField', [], {}), + 'recommendations': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + u'helpdesk.presetreply': { + 'Meta': {'ordering': "['name']", 'object_name': 'PreSetReply'}, + 'body': ('django.db.models.fields.TextField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'queues': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['helpdesk.Queue']", 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.queue': { + 'Meta': {'ordering': "('title',)", 'object_name': 'Queue'}, + 'allow_email_submission': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'allow_public_submission': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'email_box_host': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'email_box_imap_folder': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'email_box_interval': ('django.db.models.fields.IntegerField', [], {'default': "'5'", 'null': 'True', 'blank': 'True'}), + 'email_box_last_check': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'email_box_pass': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'email_box_port': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'email_box_ssl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email_box_type': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'email_box_user': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'escalate_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'locale': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'new_ticket_cc': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'socks_proxy_host': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}), + 'socks_proxy_port': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'socks_proxy_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'updated_ticket_cc': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.savedsearch': { + 'Meta': {'object_name': 'SavedSearch'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.TextField', [], {}), + 'shared': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + }, + u'helpdesk.ticket': { + 'Meta': {'ordering': "('id',)", 'object_name': 'Ticket'}, + 'assigned_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assigned_to'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'due_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_escalation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), + 'on_hold': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'priority': ('django.db.models.fields.IntegerField', [], {'default': '3', 'blank': '3'}), + 'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.Queue']"}), + 'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'submitter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + u'helpdesk.ticketcc': { + 'Meta': {'object_name': 'TicketCC'}, + 'can_update': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'can_view': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.Ticket']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.ticketchange': { + 'Meta': {'object_name': 'TicketChange'}, + 'field': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'followup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.FollowUp']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'old_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.ticketcustomfieldvalue': { + 'Meta': {'object_name': 'TicketCustomFieldValue'}, + 'field': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.CustomField']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['helpdesk.Ticket']"}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + u'helpdesk.ticketdependency': { + 'Meta': {'unique_together': "(('ticket', 'depends_on'),)", 'object_name': 'TicketDependency'}, + 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'depends_on'", 'to': u"orm['helpdesk.Ticket']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ticketdependency'", 'to': u"orm['helpdesk.Ticket']"}) + }, + u'helpdesk.usersettings': { + 'Meta': {'object_name': 'UserSettings'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'settings_pickled': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['helpdesk'] \ No newline at end of file From 9665361bb1bac1d8fa3d61afbe7114d3fd0933c5 Mon Sep 17 00:00:00 2001 From: Alex Seeholzer Date: Wed, 11 Feb 2015 12:23:59 +0100 Subject: [PATCH 27/35] In Django < 1.7, if settings.AUTH_USER_MODEL is defined, the sender is expected to be the actual instance, not a string. This Closes rossp/django-helpdesk#295 by checking for django version < 1.7. --- helpdesk/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helpdesk/models.py b/helpdesk/models.py index 1143e491..b3feb8d0 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -1041,6 +1041,10 @@ def create_usersettings(sender, instance, created, **kwargs): UserSettings.objects.create(user=instance, settings=DEFAULT_USER_SETTINGS) try: + # Connecting via settings.AUTH_USER_MODEL (string) fails in Django < 1.7. We need the actual model there. + # https://docs.djangoproject.com/en/1.7/topics/auth/customizing/#referencing-the-user-model + if django.VERSION < (1, 7): + raise ValueError models.signals.post_save.connect(create_usersettings, sender=settings.AUTH_USER_MODEL) except: signal_user = get_user_model() From a11227c6c1ed3f7ea686a7428a735300452a2408 Mon Sep 17 00:00:00 2001 From: Alex Seeholzer Date: Wed, 11 Feb 2015 13:14:36 +0100 Subject: [PATCH 28/35] Added south migration to populate the initially existing users with usersettings. --- .../0011_populate_usersettings.py | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 helpdesk/south_migrations/0011_populate_usersettings.py diff --git a/helpdesk/south_migrations/0011_populate_usersettings.py b/helpdesk/south_migrations/0011_populate_usersettings.py new file mode 100644 index 00000000..8b0514b2 --- /dev/null +++ b/helpdesk/south_migrations/0011_populate_usersettings.py @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models +from django.contrib.auth import get_user_model +from helpdesk.settings import DEFAULT_USER_SETTINGS + + +def pickle_settings(data): + """Pickling as defined at migration's creation time""" + import cPickle + from helpdesk.lib import b64encode + return b64encode(cPickle.dumps(data)) + + +# https://docs.djangoproject.com/en/1.7/topics/migrations/#data-migrations +def populate_usersettings(orm): + """Create a UserSettings entry for each existing user. + This will only happen once (at install time, or at upgrade) + when the UserSettings model doesn't already exist.""" + + _User = get_user_model() + + # Import historical version of models + User = orm[_User._meta.app_label+'.'+_User._meta.model_name] + UserSettings = orm["helpdesk"+'.'+"UserSettings"] + settings_pickled = pickle_settings(DEFAULT_USER_SETTINGS) + + for u in User.objects.all(): + try: + UserSettings.objects.get(user=u) + except UserSettings.DoesNotExist: + UserSettings.objects.create(user=u, settings_pickled=settings_pickled) + +class Migration(DataMigration): + + def forwards(self, orm): + populate_usersettings(orm) + + def backwards(self, orm): + pass + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'helpdesk.usersettings': { + 'Meta': {'object_name': 'UserSettings'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'settings_pickled': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['helpdesk'] + symmetrical = True From ddabc9d133e3fedb6cda320da2b443d70a823b90 Mon Sep 17 00:00:00 2001 From: Alex Seeholzer Date: Wed, 11 Feb 2015 13:23:42 +0100 Subject: [PATCH 29/35] bug fix for commit --- helpdesk/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpdesk/models.py b/helpdesk/models.py index b3feb8d0..505b3cba 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -11,6 +11,7 @@ from django.db import models from django.contrib.auth import get_user_model from django.conf import settings from django.utils.translation import ugettext_lazy as _, ugettext +from django import VERSION try: from django.utils import timezone @@ -1043,7 +1044,7 @@ def create_usersettings(sender, instance, created, **kwargs): try: # Connecting via settings.AUTH_USER_MODEL (string) fails in Django < 1.7. We need the actual model there. # https://docs.djangoproject.com/en/1.7/topics/auth/customizing/#referencing-the-user-model - if django.VERSION < (1, 7): + if VERSION < (1, 7): raise ValueError models.signals.post_save.connect(create_usersettings, sender=settings.AUTH_USER_MODEL) except: From 19ec7bee96fcf5c1e3a46cb1a18b286af4381d1c Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Sat, 14 Feb 2015 11:02:58 +1100 Subject: [PATCH 30/35] Extend attachment filefield max length in upload form. Fixes #301. --- helpdesk/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index 45f9ef75..23f08424 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -369,6 +369,7 @@ class PublicTicketForm(CustomFieldMixin, forms.Form): required=False, label=_('Attach File'), help_text=_('You can attach a file such as a document or screenshot to this ticket.'), + max_length=1000, ) def __init__(self, *args, **kwargs): From afe63359958a3ec004427e2815e96468a5b24162 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Sat, 14 Feb 2015 11:10:20 +1100 Subject: [PATCH 31/35] Add install instructions for email templates. Fixes #294. --- docs/install.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/install.rst b/docs/install.rst index f9561984..36475b60 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -39,7 +39,7 @@ Adding To Your Django Project 'django.contrib.admin', # Required for helpdesk admin/maintenance 'django.contrib.markup', # Required for helpdesk text display 'django.contrib.humanize', # Required for elapsed time formatting - 'south', # Highly recommended to make database migrations simpler. + 'south', # Highly recommended to make database migrations simpler in Django < 1.7 'markdown_deux', # Required for Knowledgebase item formatting 'helpdesk', # This is new! ) @@ -58,7 +58,7 @@ Adding To Your Django Project ./manage.py syncdb - Then migrate using South + Then migrate using South / Django 1.7+ migrations:: ./manage.py migrate helpdesk @@ -98,3 +98,7 @@ Adding To Your Django Project LOGIN_URL = '/helpdesk/login/' Alter the URL to suit your installation path. + +9. Load initial e-mail templates, otherwise you will not be able to setnd e-mail:: + + python manage.py loaddata emailtemplate.json From bb2c240ef86eb95cab306aba4293df05e072e561 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Sat, 14 Feb 2015 11:13:19 +1100 Subject: [PATCH 32/35] Use proper URL names for hold/unhold rather than manually building URL. Fixes #299 --- helpdesk/templates/helpdesk/ticket_desc_table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index d6016785..649c6f9c 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -4,7 +4,7 @@

    {{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]

    Edit | Delete - {% if ticket.on_hold %} | {% trans "Unhold" %}{% else %} | {% trans "Hold" %}{% endif %} + {% if ticket.on_hold %} | {% trans "Unhold" %}{% else %} | {% trans "Hold" %}{% endif %} {% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %} From e9555ff72ee9166efad4866449e78a6471bfcf73 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Thu, 19 Feb 2015 09:54:36 +1100 Subject: [PATCH 33/35] Release 0.1.16 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 82fadd5e..8dccede2 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.1.15' +version = '0.1.16' # Provided as an attribute, so you can append to these instead # of replicating them: From ae146c2e7fd7e9f19427f608c1f85a8f92848fd0 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Mon, 23 Feb 2015 14:22:28 +1100 Subject: [PATCH 34/35] Remove reference to django.contrib.markup in install docs. (#255) --- docs/install.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/install.rst b/docs/install.rst index 36475b60..ea1fb9e8 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -29,7 +29,7 @@ Download, extract, and drop ``helpdesk`` into your ``PYTHONPATH`` Adding To Your Django Project ----------------------------- -1. Edit your ``settings.py`` file and add ``helpdesk`` to the ``INSTALLED_APPS`` setting. You also need ``django.contrib.admin`` and ``django.contrib.markup`` in ``INSTALLED_APPS`` if you haven't already added it. eg:: +1. Edit your ``settings.py`` file and add ``helpdesk`` to the ``INSTALLED_APPS`` setting. You also need ``django.contrib.admin`` in ``INSTALLED_APPS`` if you haven't already added it. eg:: INSTALLED_APPS = ( 'django.contrib.auth', @@ -37,7 +37,6 @@ Adding To Your Django Project 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', # Required for helpdesk admin/maintenance - 'django.contrib.markup', # Required for helpdesk text display 'django.contrib.humanize', # Required for elapsed time formatting 'south', # Highly recommended to make database migrations simpler in Django < 1.7 'markdown_deux', # Required for Knowledgebase item formatting From 5e0ee1e37c9b7e514e382d87670f2b4b4d69001e Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Mon, 23 Feb 2015 14:24:53 +1100 Subject: [PATCH 35/35] Add bootstrapform to install docs. Closes #307. --- docs/install.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/install.rst b/docs/install.rst index ea1fb9e8..f386ea38 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -40,7 +40,8 @@ Adding To Your Django Project 'django.contrib.humanize', # Required for elapsed time formatting 'south', # Highly recommended to make database migrations simpler in Django < 1.7 'markdown_deux', # Required for Knowledgebase item formatting - 'helpdesk', # This is new! + 'bootstrapform', # Required for nicer formatting of forms with the default templates + 'helpdesk', # This is us! ) 2. Make sure django-helpdesk is accessible via ``urls.py``. Add the following line to ``urls.py``::