holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge+Fix of Alex's commit for GH-93

Browse Source 
bug fix : on update we need followup comment for notification
This commit is contained in:
Alex Garel 2011-11-29 19:25:48 +01:00 committed by Evan Borgstrom
parent 0661fc995d
commit 969c0cdc6e
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
helpdesk/management/commands/get_email.py
View File

@ -246,6 +246,39 @@ def ticket_from_message(message, queue, quiet):
t.status = Ticket.REOPENED_STATUS t.status = Ticket.REOPENED_STATUS
t.save() t.save()
f = FollowUp(
ticket = t,
title = _('E-Mail Received from %(sender_email)s' % {'sender_email': sender_email}),
date = datetime.now(),
public = True,
comment = body,
)
if t.status == Ticket.REOPENED_STATUS:
f.new_status = Ticket.REOPENED_STATUS
f.title = _('Ticket Re-Opened by E-Mail Received from %(sender_email)s' % {'sender_email': sender_email})
f.save()
if not quiet:
print (" [%s-%s] %s%s" % (t.queue.slug, t.id, t.title, update)).encode('ascii', 'replace')
for file in files:
if file['content']:
filename = file['filename'].encode('ascii', 'replace').replace(' ', '_')
filename = re.sub('[^a-zA-Z0-9._-]+', '', filename)
a = Attachment(
followup=f,
filename=filename,
mime_type=file['type'],
size=len(file['content']),
)
a.file.save(filename, ContentFile(file['content']), save=False)
a.save()
if not quiet:
print " - %s" % filename
context = { context = {
'ticket': t, 'ticket': t,
'queue': queue, 'queue': queue,
@ -281,6 +314,9 @@ def ticket_from_message(message, queue, quiet):
) )
else: else:
context.update(comment=f.comment)
if t.status == Ticket.REOPENED_STATUS: if t.status == Ticket.REOPENED_STATUS:
update = _(' (Reopened)') update = _(' (Reopened)')
else: else:
@ -304,38 +340,6 @@ def ticket_from_message(message, queue, quiet):
fail_silently=True, fail_silently=True,
) )
f = FollowUp(
ticket = t,
title = _('E-Mail Received from %(sender_email)s' % {'sender_email': sender_email}),
date = datetime.now(),
public = True,
comment = body,
)
if t.status == Ticket.REOPENED_STATUS:
f.new_status = Ticket.REOPENED_STATUS
f.title = _('Ticket Re-Opened by E-Mail Received from %(sender_email)s' % {'sender_email': sender_email})
f.save()
if not quiet:
print (" [%s-%s] %s%s" % (t.queue.slug, t.id, t.title, update)).encode('ascii', 'replace')
for file in files:
if file['content']:
filename = file['filename'].encode('ascii', 'replace').replace(' ', '_')
filename = re.sub('[^a-zA-Z0-9._-]+', '', filename)
a = Attachment(
followup=f,
filename=filename,
mime_type=file['type'],
size=len(file['content']),
)
a.file.save(filename, ContentFile(file['content']), save=False)
a.save()
if not quiet:
print " - %s" % filename
return t return t