Merge master 0.2.3 bugfixes into develop

helpdesk/views/staff.py

@@ -168,6 +168,8 @@ def dashboard(request):
         'all_tickets_reported_by_current_user': all_tickets_reported_by_current_user,
         'basic_ticket_stats': basic_ticket_stats,
     })
+
+
 dashboard = staff_member_required(dashboard)
 
 @helpdesk_staff_member_required
@@ -183,6 +185,8 @@ def delete_ticket(request, ticket_id):
     else:
         ticket.delete()
         return HttpResponseRedirect(reverse('helpdesk:home'))
+
+
 delete_ticket = staff_member_required(delete_ticket)
 
 
@@ -234,6 +238,8 @@ def followup_edit(request, ticket_id, followup_id):
             # delete old followup
             followup.delete()
         return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
+
+
 followup_edit = staff_member_required(followup_edit)
 
 
@@ -248,6 +254,8 @@ def followup_delete(request, ticket_id, followup_id):
     followup = get_object_or_404(FollowUp, id=followup_id)
     followup.delete()
     return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
+
+
 followup_delete = staff_member_required(followup_delete)
 
 
@@ -317,6 +325,8 @@ def view_ticket(request, ticket_id):
         'ticketcc_string': ticketcc_string,
         'SHOW_SUBSCRIBE': show_subscribe,
     })
+
+
 view_ticket = staff_member_required(view_ticket)
 
 
@@ -759,6 +769,8 @@ def mass_update(request):
             t.delete()
 
     return HttpResponseRedirect(reverse('helpdesk:list'))
+
+
 mass_update = staff_member_required(mass_update)
 
 
@@ -943,6 +955,8 @@ def ticket_list(request):
         saved_query=saved_query,
         search_message=search_message,
     ))
+
+
 ticket_list = staff_member_required(ticket_list)
 
 
@@ -961,6 +975,8 @@ def edit_ticket(request, ticket_id):
         form = EditTicketForm(instance=ticket)
 
     return render(request, 'helpdesk/edit_ticket.html', {'form': form})
+
+
 edit_ticket = staff_member_required(edit_ticket)
 
 
@@ -999,6 +1015,8 @@ def create_ticket(request):
             form.fields['assigned_to'].widget = forms.HiddenInput()
 
     return render(request, 'helpdesk/create_ticket.html', {'form': form})
+
+
 create_ticket = staff_member_required(create_ticket)
 
 
@@ -1021,6 +1039,9 @@ def raw_details(request, type):
     raise Http404
 
 
+raw_details = staff_member_required(raw_details)
+
+
 @helpdesk_staff_member_required
 def hold_ticket(request, ticket_id, unhold=False):
     ticket = get_object_or_404(Ticket, id=ticket_id)
@@ -1048,14 +1069,22 @@ def hold_ticket(request, ticket_id, unhold=False):
     return HttpResponseRedirect(ticket.get_absolute_url())
 
 
+hold_ticket = staff_member_required(hold_ticket)
+
+
 @helpdesk_staff_member_required
 def unhold_ticket(request, ticket_id):
     return hold_ticket(request, ticket_id, unhold=True)
 
 
+unhold_ticket = staff_member_required(unhold_ticket)
+
+
 @helpdesk_staff_member_required
 def rss_list(request):
     return render(request, 'helpdesk/rss_list.html', {'queues': Queue.objects.all()})
+
+
 rss_list = staff_member_required(rss_list)
 
 
@@ -1105,6 +1134,8 @@ def report_index(request):
         'basic_ticket_stats': basic_ticket_stats,
         'dash_tickets': dash_tickets,
     })
+
+
 report_index = staff_member_required(report_index)
 
 
@@ -1138,7 +1169,7 @@ def run_report(request, report):
                 query_params = json.loads(b64decode(str(saved_query.query)).decode())
             else:
                 query_params = json.loads(b64decode(str(saved_query.query)))
-        except:
+        except json.JSONDecodeError:
             return HttpResponseRedirect(reverse('helpdesk:report_index'))
 
         report_queryset = apply_query(report_queryset, query_params)
@@ -1306,6 +1337,8 @@ def run_report(request, report):
         'from_saved_query': from_saved_query,
         'saved_query': saved_query,
     })
+
+
 run_report = staff_member_required(run_report)
 
 
@@ -1324,6 +1357,8 @@ def save_query(request):
     query.save()
 
     return HttpResponseRedirect('%s?saved_query=%s' % (reverse('helpdesk:list'), query.id))
+
+
 save_query = staff_member_required(save_query)
 
 
@@ -1336,6 +1371,8 @@ def delete_saved_query(request, id):
         return HttpResponseRedirect(reverse('helpdesk:list'))
     else:
         return render(request, 'helpdesk/confirm_delete_saved_query.html', {'query': query})
+
+
 delete_saved_query = staff_member_required(delete_saved_query)
 
 
@@ -1351,6 +1388,8 @@ def user_settings(request):
         form = UserSettingsForm(s.settings)
 
     return render(request, 'helpdesk/user_settings.html', {'form': form})
+
+
 user_settings = staff_member_required(user_settings)
 
 
@@ -1359,6 +1398,8 @@ def email_ignore(request):
     return render(request, 'helpdesk/email_ignore_list.html', {
         'ignore_list': IgnoreEmail.objects.all(),
     })
+
+
 email_ignore = superuser_required(email_ignore)
 
 
@@ -1373,6 +1414,8 @@ def email_ignore_add(request):
         form = EmailIgnoreForm(request.GET)
 
     return render(request, 'helpdesk/email_ignore_add.html', {'form': form})
+
+
 email_ignore_add = superuser_required(email_ignore_add)
 
 
@@ -1384,6 +1427,8 @@ def email_ignore_del(request, id):
         return HttpResponseRedirect(reverse('helpdesk:email_ignore'))
     else:
         return render(request, 'helpdesk/email_ignore_del.html', {'ignore': ignore})
+
+
 email_ignore_del = superuser_required(email_ignore_del)
 
 
@@ -1398,6 +1443,8 @@ def ticket_cc(request, ticket_id):
         'copies_to': copies_to,
         'ticket': ticket,
     })
+
+
 ticket_cc = staff_member_required(ticket_cc)
 
 
@@ -1423,6 +1470,8 @@ def ticket_cc_add(request, ticket_id):
         'form_email': form_email,
         'form_user': form_user,
     })
+
+
 ticket_cc_add = staff_member_required(ticket_cc_add)
 
 
@@ -1435,6 +1484,8 @@ def ticket_cc_del(request, ticket_id, cc_id):
         return HttpResponseRedirect(reverse('helpdesk:ticket_cc',
                                             kwargs={'ticket_id': cc.ticket.id}))
     return render(request, 'helpdesk/ticket_cc_del.html', {'cc': cc})
+
+
 ticket_cc_del = staff_member_required(ticket_cc_del)
 
 
@@ -1457,6 +1508,8 @@ def ticket_dependency_add(request, ticket_id):
         'ticket': ticket,
         'form': form,
     })
+
+
 ticket_dependency_add = staff_member_required(ticket_dependency_add)
 
 
@@ -1467,6 +1520,8 @@ def ticket_dependency_del(request, ticket_id, dependency_id):
         dependency.delete()
         return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket_id]))
     return render(request, 'helpdesk/ticket_dependency_del.html', {'dependency': dependency})
+
+
 ticket_dependency_del = staff_member_required(ticket_dependency_del)
 
 
@@ -1484,6 +1539,8 @@ def attachment_del(request, ticket_id, attachment_id):
         'attachment': attachment,
         'filename': attachment.filename,
     })
+
+
 attachment_del = staff_member_required(attachment_del)