holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-25 09:23:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Easy pickings

Browse Source 
Simple code violations of reserved symbols etc.
This commit is contained in:
Martin Whitehouse 2022-07-25 02:46:33 +02:00
parent 8d63d65a7d
commit 574395ee28
No known key found for this signature in database
GPG Key ID: 3FCE1D3E9DEC09C1
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
helpdesk/views/staff.py
View File

@ -268,7 +268,7 @@ def followup_edit(request, ticket_id, followup_id):
'time_spent': format_time_spent(followup.time_spent), 'time_spent': format_time_spent(followup.time_spent),
}) })
ticketcc_string, show_subscribe = \ ticketcc_string, __ = \
return_ticketccstring_and_show_subscribe(request.user, ticket) return_ticketccstring_and_show_subscribe(request.user, ticket)
return render(request, 'helpdesk/followup_edit.html', { return render(request, 'helpdesk/followup_edit.html', {
@ -346,8 +346,10 @@ def view_ticket(request, ticket_id):
if 'subscribe' in request.GET: if 'subscribe' in request.GET:
# Allow the user to subscribe him/herself to the ticket whilst viewing # Allow the user to subscribe him/herself to the ticket whilst viewing
# it. # it.
ticket_cc, show_subscribe = \ show_subscribe = return_ticketccstring_and_show_subscribe(
return_ticketccstring_and_show_subscribe(request.user, ticket) request.user, ticket
)[1]
if show_subscribe: if show_subscribe:
subscribe_staff_member_to_ticket(ticket, request.user) subscribe_staff_member_to_ticket(ticket, request.user)
return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id])) return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
@ -760,8 +762,10 @@ def update_ticket(request, ticket_id, public=False):
# auto subscribe user if enabled # auto subscribe user if enabled
if helpdesk_settings.HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE and request.user.is_authenticated: if helpdesk_settings.HELPDESK_AUTO_SUBSCRIBE_ON_TICKET_RESPONSE and request.user.is_authenticated:
ticketcc_string, SHOW_SUBSCRIBE = return_ticketccstring_and_show_subscribe( SHOW_SUBSCRIBE = return_ticketccstring_and_show_subscribe(
request.user, ticket) request.user, ticket
)[1]
if SHOW_SUBSCRIBE: if SHOW_SUBSCRIBE:
subscribe_staff_member_to_ticket(ticket, request.user) subscribe_staff_member_to_ticket(ticket, request.user)
@ -924,7 +928,7 @@ def merge_tickets(request):
for ticket in tickets: for ticket in tickets:
ticket.values = {} ticket.values = {}
# Prepare the value for each attributes of this ticket # Prepare the value for each attributes of this ticket
for attribute, display_name in ticket_attributes: for attribute, __ in ticket_attributes:
value = getattr(ticket, attribute, default) value = getattr(ticket, attribute, default)
# Check if attr is a get_FIELD_display # Check if attr is a get_FIELD_display
if attribute.startswith('get_') and attribute.endswith('_display'): if attribute.startswith('get_') and attribute.endswith('_display'):
@ -959,7 +963,7 @@ def merge_tickets(request):
) )
else: else:
# Save ticket fields values # Save ticket fields values
for attribute, display_name in ticket_attributes: for attribute, __ in ticket_attributes:
id_for_attribute = request.POST.get(attribute) id_for_attribute = request.POST.get(attribute)
if id_for_attribute != chosen_ticket.id: if id_for_attribute != chosen_ticket.id:
try: try:
@ -1086,16 +1090,16 @@ def ticket_list(request):
if request.GET.get('search_type', None) == 'header': if request.GET.get('search_type', None) == 'header':
query = request.GET.get('q') query = request.GET.get('q')
filter = None filter_ = None
if query.find('-') > 0: if query.find('-') > 0:
try: try:
queue, id = Ticket.queue_and_id_from_query(query) queue, id_ = Ticket.queue_and_id_from_query(query)
id = int(id) id_ = int(id)
except ValueError: except ValueError:
id = None id_ = None
if id: if id_:
filter = {'queue__slug': queue, 'id': id} filter_ = {'queue__slug': queue, 'id': id_}
else: else:
try: try:
query = int(query) query = int(query)
@ -1103,11 +1107,11 @@ def ticket_list(request):
query = None query = None
if query: if query:
filter = {'id': int(query)} filter_ = {'id': int(query)}
if filter: if filter_:
try: try:
ticket = huser.get_tickets_in_queues().get(**filter) ticket = huser.get_tickets_in_queues().get(**filter_)
return HttpResponseRedirect(ticket.staff_url) return HttpResponseRedirect(ticket.staff_url)
except Ticket.DoesNotExist: except Ticket.DoesNotExist:
# Go on to standard keyword searching # Go on to standard keyword searching
@ -1308,15 +1312,15 @@ class CreateTicketView(MustBeStaffMixin, abstract_views.AbstractCreateTicketMixi
@helpdesk_staff_member_required @helpdesk_staff_member_required
def raw_details(request, type): def raw_details(request, type_):
# TODO: This currently only supports spewing out 'PreSetReply' objects, # TODO: This currently only supports spewing out 'PreSetReply' objects,
# in the future it needs to be expanded to include other items. All it # in the future it needs to be expanded to include other items. All it
# does is return a plain-text representation of an object. # does is return a plain-text representation of an object.
if type not in ('preset',): if type_ not in ('preset',):
raise Http404 raise Http404
if type == 'preset' and request.GET.get('id', False): if type_ == 'preset' and request.GET.get('id', False):
try: try:
preset = PreSetReply.objects.get(id=request.GET.get('id')) preset = PreSetReply.objects.get(id=request.GET.get('id'))
return HttpResponse(preset.body) return HttpResponse(preset.body)
@ -1634,8 +1638,8 @@ save_query = staff_member_required(save_query)
@helpdesk_staff_member_required @helpdesk_staff_member_required
def delete_saved_query(request, id): def delete_saved_query(request, pk):
query = get_object_or_404(SavedSearch, id=id, user=request.user) query = get_object_or_404(SavedSearch, id=pk, user=request.user)
if request.method == 'POST': if request.method == 'POST':
query.delete() query.delete()
@ -1684,8 +1688,8 @@ email_ignore_add = superuser_required(email_ignore_add)
@helpdesk_superuser_required @helpdesk_superuser_required
def email_ignore_del(request, id): def email_ignore_del(request, pk):
ignore = get_object_or_404(IgnoreEmail, id=id) ignore = get_object_or_404(IgnoreEmail, id=pk)
if request.method == 'POST': if request.method == 'POST':
ignore.delete() ignore.delete()
return HttpResponseRedirect(reverse('helpdesk:email_ignore')) return HttpResponseRedirect(reverse('helpdesk:email_ignore'))