extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 00:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

almost auto-fix on misc files

Browse Source
This commit is contained in:
Alex Barcelo
2016-10-23 22:09:17 +02:00
parent 3c35473265
commit 30e3aa55aa
10 changed files with 230 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
helpdesk/models.py
View File

@ -36,7 +36,7 @@ class Queue(models.Model):
title = models.CharField(
_('Title'),
max_length=100,
)
)
slug = models.SlugField(
_('Slug'),
@ -44,7 +44,7 @@ class Queue(models.Model):
unique=True,
help_text=_('This slug is used when building ticket ID\'s. Once set, '
'try not to change it or e-mailing may get messy.'),
)
)
email_address = models.EmailField(
_('E-Mail Address'),
@ -53,7 +53,7 @@ class Queue(models.Model):
help_text=_('All outgoing e-mails for this queue will use this e-mail '
'address. If you use IMAP or POP3, this should be the e-mail '
'address for that mailbox.'),
)
)
locale = models.CharField(
_('Locale'),
@ -62,14 +62,14 @@ class Queue(models.Model):
null=True,
help_text=_('Locale of this queue. All correspondence in this '
'queue will be in this language.'),
)
)
allow_public_submission = models.BooleanField(
_('Allow Public Submission?'),
blank=True,
default=False,
help_text=_('Should this queue be listed on the public submission form?'),
)
)
allow_email_submission = models.BooleanField(
_('Allow E-Mail Submission?'),
@ -77,7 +77,7 @@ class Queue(models.Model):
default=False,
help_text=_('Do you want to poll the e-mail box below for new '
'tickets?'),
)
)
escalate_days = models.IntegerField(
_('Escalation Days'),
@ -85,7 +85,7 @@ class Queue(models.Model):
null=True,
help_text=_('For tickets which are not held, how often do you wish to '
'increase their priority? Set to 0 for no escalation.'),
)
)
new_ticket_cc = models.CharField(
_('New Ticket CC Address'),
@ -95,7 +95,7 @@ class Queue(models.Model):
help_text=_('If an e-mail address is entered here, then it will '
'receive notification of all new tickets created for this queue. '
'Enter a comma between multiple e-mail addresses.'),
)
)
updated_ticket_cc = models.CharField(
_('Updated Ticket CC Address'),
@ -106,7 +106,7 @@ class Queue(models.Model):
'receive notification of all activity (new tickets, closed '
'tickets, updates, reassignments, etc) for this queue. Separate '
'multiple addresses with a comma.'),
)
)
email_box_type = models.CharField(
_('E-Mail Box Type'),
@ -116,7 +116,7 @@ class Queue(models.Model):
null=True,
help_text=_('E-Mail server type for creating tickets automatically '
'from a mailbox - both POP3 and IMAP are supported.'),
)
)
email_box_host = models.CharField(
_('E-Mail Hostname'),
@ -125,7 +125,7 @@ class Queue(models.Model):
null=True,
help_text=_('Your e-mail server address - either the domain name or '
'IP address. May be "localhost".'),
)
)
email_box_port = models.IntegerField(
_('E-Mail Port'),
@ -134,7 +134,7 @@ class Queue(models.Model):
help_text=_('Port number to use for accessing e-mail. Default for '
'POP3 is "110", and for IMAP is "143". This may differ on some '
'servers. Leave it blank to use the defaults.'),
)
)
email_box_ssl = models.BooleanField(
_('Use SSL for E-Mail?'),
@ -142,7 +142,7 @@ class Queue(models.Model):
default=False,
help_text=_('Whether to use SSL for IMAP or POP3 - the default ports '
'when using SSL are 993 for IMAP and 995 for POP3.'),
)
)
email_box_user = models.CharField(
_('E-Mail Username'),
@ -150,7 +150,7 @@ class Queue(models.Model):
blank=True,
null=True,
help_text=_('Username for accessing this mailbox.'),
)
)
email_box_pass = models.CharField(
_('E-Mail Password'),
@ -158,7 +158,7 @@ class Queue(models.Model):
blank=True,
null=True,
help_text=_('Password for the above username'),
)
)
email_box_imap_folder = models.CharField(
_('IMAP Folder'),
@ -169,7 +169,7 @@ class Queue(models.Model):
'from? This allows you to use one IMAP account for multiple '
'queues, by filtering messages on your IMAP server into separate '
'folders. Default: INBOX.'),
)
)
permission_name = models.CharField(
_('Django auth permission name'),
@ -178,8 +178,7 @@ class Queue(models.Model):
null=True,
editable=False,
help_text=_('Name used in the django.contrib.auth permission system'),
)
)
email_box_interval = models.IntegerField(
_('E-Mail Check Interval'),
@ -187,14 +186,14 @@ class Queue(models.Model):
blank=True,
null=True,
default='5',
)
)
email_box_last_check = models.DateTimeField(
blank=True,
null=True,
editable=False,
# This is updated by management/commands/get_mail.py.
)
)
socks_proxy_type = models.CharField(
_('Socks Proxy Type'),
@ -347,24 +346,24 @@ class Ticket(models.Model):
title = models.CharField(
_('Title'),
max_length=200,
)
)
queue = models.ForeignKey(
Queue,
verbose_name=_('Queue'),
)
)
created = models.DateTimeField(
_('Created'),
blank=True,
help_text=_('Date this ticket was first created'),
)
)
modified = models.DateTimeField(
_('Modified'),
blank=True,
help_text=_('Date this ticket was most recently changed.'),
)
)
submitter_email = models.EmailField(
_('Submitter E-Mail'),
@ -372,7 +371,7 @@ class Ticket(models.Model):
null=True,
help_text=_('The submitter will receive an email for all public '
'follow-ups left for this task.'),
)
)
assigned_to = models.ForeignKey(
settings.AUTH_USER_MODEL,
@ -380,34 +379,34 @@ class Ticket(models.Model):
blank=True,
null=True,
verbose_name=_('Assigned to'),
)
)
status = models.IntegerField(
_('Status'),
choices=STATUS_CHOICES,
default=OPEN_STATUS,
)
)
on_hold = models.BooleanField(
_('On Hold'),
blank=True,
default=False,
help_text=_('If a ticket is on hold, it will not automatically be escalated.'),
)
)
description = models.TextField(
_('Description'),
blank=True,
null=True,
help_text=_('The content of the customers query.'),
)
)
resolution = models.TextField(
_('Resolution'),
blank=True,
null=True,
help_text=_('The resolution provided to the customer by our staff.'),
)
)
priority = models.IntegerField(
_('Priority'),
@ -415,13 +414,13 @@ class Ticket(models.Model):
default=3,
blank=3,
help_text=_('1 = Highest Priority, 5 = Low Priority'),
)
)
due_date = models.DateTimeField(
_('Due on'),
blank=True,
null=True,
)
)
last_escalation = models.DateTimeField(
blank=True,
@ -429,7 +428,7 @@ class Ticket(models.Model):
editable=False,
help_text=_('The date this ticket was last escalated - updated '
'automatically by management/commands/escalate_tickets.py.'),
)
)
def _get_assigned_to(self):
""" Custom property to allow us to easily print 'Unassigned' if a
@ -479,7 +478,8 @@ class Ticket(models.Model):
Displays the ticket status, with an "On Hold" message if needed.
"""
held_msg = ''
if self.on_hold: held_msg = _(' - On Hold')
if self.on_hold:
held_msg = _(' - On Hold')
dep_msg = ''
if not self.can_be_resolved:
dep_msg = _(' - Open dependencies')
@ -502,7 +502,7 @@ class Ticket(models.Model):
reverse('helpdesk_public_view'),
self.ticket_for_url,
self.submitter_email
)
)
ticket_url = property(_get_ticket_url)
def _get_staff_url(self):
@ -519,8 +519,8 @@ class Ticket(models.Model):
return u"http://%s%s" % (
site.domain,
reverse('helpdesk_view',
args=[self.id])
)
args=[self.id])
)
staff_url = property(_get_staff_url)
def _can_be_resolved(self):
@ -569,6 +569,7 @@ class Ticket(models.Model):
class FollowUpManager(models.Manager):
def private_followups(self):
return self.filter(public=False)
@ -593,25 +594,25 @@ class FollowUp(models.Model):
ticket = models.ForeignKey(
Ticket,
verbose_name=_('Ticket'),
)
)
date = models.DateTimeField(
_('Date'),
default = timezone.now
)
default=timezone.now
)
title = models.CharField(
_('Title'),
max_length=200,
blank=True,
null=True,
)
)
comment = models.TextField(
_('Comment'),
blank=True,
null=True,
)
)
public = models.BooleanField(
_('Public'),
@ -619,14 +620,14 @@ class FollowUp(models.Model):
default=False,
help_text=_('Public tickets are viewable by the submitter and all '
'staff, but non-public tickets can only be seen by staff.'),
)
)
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
blank=True,
null=True,
verbose_name=_('User'),
)
)
new_status = models.IntegerField(
_('New Status'),
@ -634,12 +635,12 @@ class FollowUp(models.Model):
blank=True,
null=True,
help_text=_('If the status was changed, what was it changed to?'),
)
)
objects = FollowUpManager()
class Meta:
ordering = ['date']
ordering = ('date',)
verbose_name = _('Follow-up')
verbose_name_plural = _('Follow-ups')
@ -666,24 +667,24 @@ class TicketChange(models.Model):
followup = models.ForeignKey(
FollowUp,
verbose_name=_('Follow-up'),
)
)
field = models.CharField(
_('Field'),
max_length=100,
)
)
old_value = models.TextField(
_('Old Value'),
blank=True,
null=True,
)
)
new_value = models.TextField(
_('New Value'),
blank=True,
null=True,
)
)
def __str__(self):
out = '%s ' % self.field
@ -695,7 +696,7 @@ class TicketChange(models.Model):
out += ugettext('changed from "%(old_value)s" to "%(new_value)s"') % {
'old_value': self.old_value,
'new_value': self.new_value
}
}
return out
class Meta:
@ -711,7 +712,7 @@ def attachment_path(instance, filename):
import os
from django.conf import settings
os.umask(0)
path = 'helpdesk/attachments/%s/%s' % (instance.followup.ticket.ticket_for_url, instance.followup.id )
path = 'helpdesk/attachments/%s/%s' % (instance.followup.ticket.ticket_for_url, instance.followup.id)
att_path = os.path.join(settings.MEDIA_ROOT, path)
if settings.DEFAULT_FILE_STORAGE == "django.core.files.storage.FileSystemStorage":
if not os.path.exists(att_path):
@ -729,28 +730,28 @@ class Attachment(models.Model):
followup = models.ForeignKey(
FollowUp,
verbose_name=_('Follow-up'),
)
)
file = models.FileField(
_('File'),
upload_to=attachment_path,
max_length=1000,
)
)
filename = models.CharField(
_('Filename'),
max_length=1000,
)
)
mime_type = models.CharField(
_('MIME Type'),
max_length=255,
)
)
size = models.IntegerField(
_('Size'),
help_text=_('Size of this file in bytes'),
)
)
def get_upload_to(self, field_attname):
""" Get upload_to path specific to this item """
@ -759,13 +760,13 @@ class Attachment(models.Model):
return u'helpdesk/attachments/%s/%s' % (
self.followup.ticket.ticket_for_url,
self.followup.id
)
)
def __str__(self):
return '%s' % self.filename
class Meta:
ordering = ['filename',]
ordering = ('filename',)
verbose_name = _('Attachment')
verbose_name_plural = _('Attachments')
@ -783,7 +784,7 @@ class PreSetReply(models.Model):
queue, and the body text is fetched via AJAX.
"""
class Meta:
ordering = ['name', ]
ordering = ('name',)
verbose_name = _('Pre-set reply')
verbose_name_plural = _('Pre-set replies')
@ -792,21 +793,21 @@ class PreSetReply(models.Model):
blank=True,
help_text=_('Leave blank to allow this reply to be used for all '
'queues, or select those queues you wish to limit this reply to.'),
)
)
name = models.CharField(
_('Name'),
max_length=100,
help_text=_('Only used to assist users with selecting a reply - not '
'shown to the user.'),
)
)
body = models.TextField(
_('Body'),
help_text=_('Context available: {{ ticket }} - ticket object (eg '
'{{ ticket.title }}); {{ queue }} - The queue; and {{ user }} '
'- the current user.'),
)
)
def __str__(self):
return '%s' % self.name
@ -829,17 +830,17 @@ class EscalationExclusion(models.Model):
blank=True,
help_text=_('Leave blank for this exclusion to be applied to all queues, '
'or select those queues you wish to exclude with this entry.'),
)
)
name = models.CharField(
_('Name'),
max_length=100,
)
)
date = models.DateField(
_('Date'),
help_text=_('Date on which escalation should not happen'),
)
)
def __str__(self):
return '%s' % self.name
@ -862,7 +863,7 @@ class EmailTemplate(models.Model):
template_name = models.CharField(
_('Template Name'),
max_length=100,
)
)
subject = models.CharField(
_('Subject'),
@ -870,7 +871,7 @@ class EmailTemplate(models.Model):
help_text=_('This will be prefixed with "[ticket.ticket] ticket.title"'
'. We recommend something simple such as "(Updated") or "(Closed)"'
' - the same context is available as in plain_text, below.'),
)
)
heading = models.CharField(
_('Heading'),
@ -878,19 +879,19 @@ class EmailTemplate(models.Model):
help_text=_('In HTML e-mails, this will be the heading at the top of '
'the email - the same context is available as in plain_text, '
'below.'),
)
)
plain_text = models.TextField(
_('Plain Text'),
help_text=_('The context available to you includes {{ ticket }}, '
'{{ queue }}, and depending on the time of the call: '
'{{ resolution }} or {{ comment }}.'),
)
)
html = models.TextField(
_('HTML'),
help_text=_('The same context is available here as in plain_text, above.'),
)
)
locale = models.CharField(
_('Locale'),
@ -898,13 +899,13 @@ class EmailTemplate(models.Model):
blank=True,
null=True,
help_text=_('Locale of this template.'),
)
)
def __str__(self):
return '%s' % self.template_name
class Meta:
ordering = ['template_name', 'locale']
ordering = ('template_name', 'locale')
verbose_name = _('e-mail template')
verbose_name_plural = _('e-mail templates')
@ -919,21 +920,21 @@ class KBCategory(models.Model):
title = models.CharField(
_('Title'),
max_length=100,
)
)
slug = models.SlugField(
_('Slug'),
)
)
description = models.TextField(
_('Description'),
)
)
def __str__(self):
return '%s' % self.title
class Meta:
ordering = ['title',]
ordering = ('title',)
verbose_name = _('Knowledge base category')
verbose_name_plural = _('Knowledge base categories')
@ -951,38 +952,38 @@ class KBItem(models.Model):
category = models.ForeignKey(
KBCategory,
verbose_name=_('Category'),
)
)
title = models.CharField(
_('Title'),
max_length=100,
)
)
question = models.TextField(
_('Question'),
)
)
answer = models.TextField(
_('Answer'),
)
)
votes = models.IntegerField(
_('Votes'),
help_text=_('Total number of votes cast for this item'),
default=0,
)
)
recommendations = models.IntegerField(
_('Positive Votes'),
help_text=_('Number of votes for this item which were POSITIVE.'),
default=0,
)
)
last_updated = models.DateTimeField(
_('Last Updated'),
help_text=_('The date on which this question was most recently changed.'),
blank=True,
)
)
def save(self, *args, **kwargs):
if not self.last_updated:
@ -1000,7 +1001,7 @@ class KBItem(models.Model):
return '%s' % self.title
class Meta:
ordering = ['title',]
ordering = ('title',)
verbose_name = _('Knowledge base item')
verbose_name_plural = _('Knowledge base items')
@ -1024,25 +1025,25 @@ class SavedSearch(models.Model):
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
verbose_name=_('User'),
)
)
title = models.CharField(
_('Query Name'),
max_length=100,
help_text=_('User-provided name for this query'),
)
)
shared = models.BooleanField(
_('Shared With Other Users?'),
blank=True,
default=False,
help_text=_('Should other users see this query?'),
)
)
query = models.TextField(
_('Search Query'),
help_text=_('Pickled query object. Be wary changing this.'),
)
)
def __str__(self):
if self.shared:
@ -1073,7 +1074,7 @@ class UserSettings(models.Model):
'Do not change this field via the admin.'),
blank=True,
null=True,
)
)
def _set_settings(self, data):
# data should always be a Python dictionary.
@ -1138,26 +1139,26 @@ class IgnoreEmail(models.Model):
blank=True,
help_text=_('Leave blank for this e-mail to be ignored on all queues, '
'or select those queues you wish to ignore this e-mail for.'),
)
)
name = models.CharField(
_('Name'),
max_length=100,
)
)
date = models.DateField(
_('Date'),
help_text=_('Date on which this e-mail address was added'),
blank=True,
editable=False
)
)
email_address = models.CharField(
_('E-Mail Address'),
max_length=150,
help_text=_('Enter a full e-mail address, or portions with '
'wildcards, eg *@domain.com or postmaster@*.'),
)
)
keep_in_mailbox = models.BooleanField(
_('Save Emails in Mailbox?'),
@ -1165,7 +1166,7 @@ class IgnoreEmail(models.Model):
default=False,
help_text=_('Do you want to save emails from this address in the mailbox? '
'If this is unticked, emails from this address will be deleted.'),
)
)
def __str__(self):
return '%s' % self.name
@ -1213,7 +1214,7 @@ class TicketCC(models.Model):
ticket = models.ForeignKey(
Ticket,
verbose_name=_('Ticket'),
)
)
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
@ -1221,28 +1222,28 @@ class TicketCC(models.Model):
null=True,
help_text=_('User who wishes to receive updates for this ticket.'),
verbose_name=_('User'),
)
)
email = models.EmailField(
_('E-Mail Address'),
blank=True,
null=True,
help_text=_('For non-user followers, enter their e-mail address'),
)
)
can_view = models.BooleanField(
_('Can View Ticket?'),
blank=True,
default=False,
help_text=_('Can this CC login to view the ticket details?'),
)
)
can_update = models.BooleanField(
_('Can Update Ticket?'),
blank=True,
default=False,
help_text=_('Can this CC login and update the ticket?'),
)
)
def _email_address(self):
if self.user and self.user.email is not None:
@ -1263,6 +1264,7 @@ class TicketCC(models.Model):
class CustomFieldManager(models.Manager):
def get_queryset(self):
return super(CustomFieldManager, self).get_queryset().order_by('ordering')
@ -1278,77 +1280,77 @@ class CustomField(models.Model):
help_text=_('As used in the database and behind the scenes. '
'Must be unique and consist of only lowercase letters with no punctuation.'),
unique=True,
)
)
label = models.CharField(
_('Label'),
max_length=30,
help_text=_('The display label for this field'),
)
)
help_text = models.TextField(
_('Help Text'),
help_text=_('Shown to the user when editing the ticket'),
blank=True,
null=True
)
)
DATA_TYPE_CHOICES = (
('varchar', _('Character (single line)')),
('text', _('Text (multi-line)')),
('integer', _('Integer')),
('decimal', _('Decimal')),
('list', _('List')),
('boolean', _('Boolean (checkbox yes/no)')),
('date', _('Date')),
('time', _('Time')),
('datetime', _('Date & Time')),
('email', _('E-Mail Address')),
('url', _('URL')),
('ipaddress', _('IP Address')),
('slug', _('Slug')),
)
('varchar', _('Character (single line)')),
('text', _('Text (multi-line)')),
('integer', _('Integer')),
('decimal', _('Decimal')),
('list', _('List')),
('boolean', _('Boolean (checkbox yes/no)')),
('date', _('Date')),
('time', _('Time')),
('datetime', _('Date & Time')),
('email', _('E-Mail Address')),
('url', _('URL')),
('ipaddress', _('IP Address')),
('slug', _('Slug')),
)
data_type = models.CharField(
_('Data Type'),
max_length=100,
help_text=_('Allows you to restrict the data entered into this field'),
choices=DATA_TYPE_CHOICES,
)
)
max_length = models.IntegerField(
_('Maximum Length (characters)'),
blank=True,
null=True,
)
)
decimal_places = models.IntegerField(
_('Decimal Places'),
help_text=_('Only used for decimal fields'),
blank=True,
null=True,
)
)
empty_selection_list = models.BooleanField(
_('Add empty first choice to List?'),
default=False,
help_text=_('Only for List: adds an empty first entry to the choices list, '
'which enforces that the user makes an active choice.'),
)
)
list_values = models.TextField(
_('List Values'),
help_text=_('For list fields only. Enter one option per line.'),
blank=True,
null=True,
)
)
ordering = models.IntegerField(
_('Ordering'),
help_text=_('Lower numbers are displayed first; higher numbers are listed later'),
blank=True,
null=True,
)
)
def _choices_as_array(self):
from StringIO import StringIO
@ -1362,14 +1364,14 @@ class CustomField(models.Model):
_('Required?'),
help_text=_('Does the user have to enter a value for this field?'),
default=False,
)
)
staff_only = models.BooleanField(
_('Staff Only?'),
help_text=_('If this is ticked, then the public submission form '
'will NOT show this field'),
default=False,
)
)
objects = CustomFieldManager()
@ -1386,12 +1388,12 @@ class TicketCustomFieldValue(models.Model):
ticket = models.ForeignKey(
Ticket,
verbose_name=_('Ticket'),
)
)
field = models.ForeignKey(
CustomField,
verbose_name=_('Field'),
)
)
value = models.TextField(blank=True, null=True)
@ -1420,13 +1422,13 @@ class TicketDependency(models.Model):
Ticket,
verbose_name=_('Ticket'),
related_name='ticketdependency',
)
)
depends_on = models.ForeignKey(
Ticket,
verbose_name=_('Depends On Ticket'),
related_name='depends_on',
)
)
def __str__(self):
return '%s / %s' % (self.ticket, self.depends_on)