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

fixing those two python files

Browse Source
This commit is contained in:
Alex Barcelo 2016-10-24 10:05:41 +02:00
parent 179ceb2f82
commit f017adea63
2 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/akismet.py
View File

@ -31,7 +31,7 @@ The default is : ::
Whatever you pass in, will replace the *Python Interface by Fuzzyman* part.
**0.2.0** will change with the version of this interface.
Usage example::
Usage example:
from akismet import Akismet
@ -70,7 +70,7 @@ __all__ = (
'Akismet',
'AkismetError',
'APIKeyError',
)
)
__author__ = 'Michael Foord <fuzzyman AT voidspace DOT org DOT uk>'
@ -203,13 +203,13 @@ class Akismet(object):
worked out.
"""
data['comment_content'] = comment
if not 'user_ip' in data:
if 'user_ip' not in data:
try:
val = os.environ['REMOTE_ADDR']
except KeyError:
raise AkismetError("No 'user_ip' supplied")
data['user_ip'] = val
if not 'user_agent' in data:
if 'user_agent' not in data:
try:
val = os.environ['HTTP_USER_AGENT']
except KeyError:

21
helpdesk/views/api.py
View File

@ -71,7 +71,7 @@ def api(request, method):
request.user = authenticate(
username=request.POST.get('user', False),
password=request.POST.get('password'),
)
)
if request.user is None:
return api_return(STATUS_ERROR_PERMISSIONS)
@ -109,6 +109,7 @@ def api_return(status, text='', json=False):
class API:
def __init__(self, request):
self.request = request
@ -195,7 +196,7 @@ class API:
comment=message,
user=self.request.user,
title='Comment Added',
)
)
if public:
f.public = True
@ -214,7 +215,7 @@ class API:
recipients=ticket.submitter_email,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(ticket.submitter_email)
if public:
@ -226,7 +227,7 @@ class API:
recipients=cc.email_address,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(cc.email_address)
if ticket.queue.updated_ticket_cc and ticket.queue.updated_ticket_cc not in messages_sent_to:
@ -236,7 +237,7 @@ class API:
recipients=ticket.queue.updated_ticket_cc,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(ticket.queue.updated_ticket_cc)
if (
@ -276,7 +277,7 @@ class API:
user=self.request.user,
title='Resolved',
public=True,
)
)
f.save()
context = safe_template_context(ticket)
@ -293,7 +294,7 @@ class API:
recipients=ticket.submitter_email,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(ticket.submitter_email)
for cc in ticket.ticketcc_set.all():
@ -304,7 +305,7 @@ class API:
recipients=cc.email_address,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(cc.email_address)
if ticket.queue.updated_ticket_cc and ticket.queue.updated_ticket_cc not in messages_sent_to:
@ -314,7 +315,7 @@ class API:
recipients=ticket.queue.updated_ticket_cc,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
messages_sent_to.append(ticket.queue.updated_ticket_cc)
if ticket.assigned_to and \
@ -329,7 +330,7 @@ class API:
recipients=ticket.assigned_to.email,
sender=ticket.queue.from_address,
fail_silently=True,
)
)
ticket.resoltuion = f.comment
ticket.status = Ticket.RESOLVED_STATUS