Initial general clean-up of stuff

This commit is contained in:
Alex Barcelo
2016-10-21 17:14:12 +02:00
parent 5e340338b4
commit 24d88be8d9
27 changed files with 827 additions and 710 deletions

View File

@ -11,16 +11,10 @@ The API documentation can be accessed by visiting http://helpdesk/api/help/
through templates/helpdesk/help_api.html.
"""
from django import forms
from django.contrib.auth import authenticate
try:
from django.contrib.auth import get_user_model
User = get_user_model()
except ImportError:
from django.contrib.auth.models import User
from django.contrib.auth import get_user_model
from django.http import HttpResponse
from django.shortcuts import render
from django.template import loader, Context
import simplejson
from django.views.decorators.csrf import csrf_exempt
@ -35,6 +29,8 @@ from helpdesk.models import Ticket, Queue, FollowUp
import warnings
User = get_user_model()
STATUS_OK = 200
STATUS_ERROR = 400
@ -61,7 +57,9 @@ def api(request, method):
"""
warnings.warn("django-helpdesk API will be removed in January 2016. See https://github.com/django-helpdesk/django-helpdesk/issues/198 for details.", category=DeprecationWarning)
warnings.warn("django-helpdesk API will be removed in January 2016. "
"See https://github.com/django-helpdesk/django-helpdesk/issues/198 for details.",
category=DeprecationWarning)
if method == 'help':
return render(request, template_name='helpdesk/help_api.html')
@ -114,7 +112,6 @@ class API:
def __init__(self, request):
self.request = request
def api_public_create_ticket(self):
form = TicketForm(self.request.POST)
form.fields['queue'].choices = [[q.id, q.title] for q in Queue.objects.all()]
@ -126,10 +123,11 @@ class API:
else:
return api_return(STATUS_ERROR, text=form.errors.as_text())
def api_public_list_queues(self):
return api_return(STATUS_OK, simplejson.dumps([{"id": "%s" % q.id, "title": "%s" % q.title} for q in Queue.objects.all()]), json=True)
return api_return(STATUS_OK, simplejson.dumps([
{"id": "%s" % q.id, "title": "%s" % q.title}
for q in Queue.objects.all()
]), json=True)
def api_public_find_user(self):
username = self.request.POST.get('username', False)
@ -141,7 +139,6 @@ class API:
except User.DoesNotExist:
return api_return(STATUS_ERROR, "Invalid username provided")
def api_public_delete_ticket(self):
if not self.request.POST.get('confirm', False):
return api_return(STATUS_ERROR, "No confirmation provided")
@ -155,7 +152,6 @@ class API:
return api_return(STATUS_OK)
def api_public_hold_ticket(self):
try:
ticket = Ticket.objects.get(id=self.request.POST.get('ticket', False))
@ -167,7 +163,6 @@ class API:
return api_return(STATUS_OK)
def api_public_unhold_ticket(self):
try:
ticket = Ticket.objects.get(id=self.request.POST.get('ticket', False))
@ -179,7 +174,6 @@ class API:
return api_return(STATUS_OK)
def api_public_add_followup(self):
try:
ticket = Ticket.objects.get(id=self.request.POST.get('ticket', False))
@ -264,7 +258,6 @@ class API:
return api_return(STATUS_OK)
def api_public_resolve(self):
try:
ticket = Ticket.objects.get(id=self.request.POST.get('ticket', False))
@ -289,7 +282,7 @@ class API:
context = safe_template_context(ticket)
context['resolution'] = f.comment
subject = '%s %s (Resolved)' % (ticket.ticket, ticket.title)
# subject = '%s %s (Resolved)' % (ticket.ticket, ticket.title)
messages_sent_to = []
@ -324,7 +317,12 @@ class API:
)
messages_sent_to.append(ticket.queue.updated_ticket_cc)
if ticket.assigned_to and self.request.user != ticket.assigned_to and getattr(ticket.assigned_to.usersettings.settings, 'email_on_ticket_apichange', False) and ticket.assigned_to.email and ticket.assigned_to.email not in messages_sent_to:
if ticket.assigned_to and \
self.request.user != ticket.assigned_to and \
getattr(ticket.assigned_to.usersettings.settings,
'email_on_ticket_apichange', False) and \
ticket.assigned_to.email and \
ticket.assigned_to.email not in messages_sent_to:
send_templated_mail(
'resolved_resolved',
context,