Update breadcrumbs on ticket pages

helpdesk/templates/helpdesk/confirm_delete_saved_query.html

@@ -1,5 +1,12 @@
 {% extends "helpdesk/base.html" %}{% load i18n %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="#">Tickets</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Delete Saved Query" %}</li>
+{% endblock %}
+
 {% block helpdesk_title %}{% trans "Delete Saved Query" %}{% endblock %}
 
 {% block helpdesk_body %}

helpdesk/templates/helpdesk/create_ticket.html

@@ -4,9 +4,9 @@
 
 {% block helpdesk_breadcrumb %}
 <li class="breadcrumb-item">
-    <a href="#">Tickets</a>
+    <a href="#">{% trans "Tickets" %}</a>
 </li>
-<li class="breadcrumb-item active">Create a New Ticket</li>
+<li class="breadcrumb-item active">{% trans "Create Ticket" %}</li>
 {% endblock %}
 
 {% block helpdesk_head %}

helpdesk/templates/helpdesk/dashboard.html

@@ -1,4 +1,5 @@
 {% extends "helpdesk/base.html" %}{% load i18n %}
+
 {% block helpdesk_title %}{% trans "Helpdesk Dashboard" %}{% endblock %}
 
 {% block helpdesk_breadcrumb %}

helpdesk/templates/helpdesk/delete_ticket.html

@@ -2,6 +2,16 @@
 
 {% block helpdesk_title %}{% trans "Delete Ticket" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}{{ ticket.id }}/">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Delete Ticket" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 <h2>{% trans "Delete Ticket" %}</h2>
 

helpdesk/templates/helpdesk/edit_ticket.html

@@ -2,6 +2,16 @@
 
 {% block helpdesk_title %}{% trans "Edit Ticket" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}{{ ticket.id }}/">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Edit Ticket" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 <div class="col-xs-6">
 <div class="panel panel-default">

helpdesk/templates/helpdesk/email_ignore_add.html

@@ -2,6 +2,13 @@
 
 {% block helpdesk_title %}{% trans "Ignore E-Mail Address" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Ignore E-Mail Address" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 <h2>{% trans "Ignore E-Mail Address" %}</h2>
 

helpdesk/templates/helpdesk/ticket.html

@@ -1,7 +1,9 @@
 {% extends "helpdesk/base.html" %}
 {% load i18n bootstrap humanize %}
 {% load static from staticfiles %}
+
 {% block helpdesk_title %}{{ ticket.queue.slug }}-{{ ticket.id }} : {% trans "View Ticket Details" %}{% endblock %}
+
 {% block helpdesk_head %}
 <script type='text/javascript' language='javascript'>
 $(document).ready(function() {
@@ -61,6 +63,15 @@ $(document).on('change', ':file', function() {
 
 {% block h1_title %}{{ ticket.ticket_for_url }}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item active">
+    {{ ticket.queue.slug }}-{{ ticket.id }}
+</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 {% if helpdesk_settings.HELPDESK_TRANSLATE_TICKET_COMMENTS %}
 {% comment %}

helpdesk/templates/helpdesk/ticket_cc_add.html

@@ -2,6 +2,19 @@
 
 {% block helpdesk_title %}{% trans "Add Ticket CC" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}{{ ticket.id }}/">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:ticket_cc' ticket.id %}">{% trans "CC Settings" %}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Add CC" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}
 <h2>{% trans 'Add Ticket CC' %}</h2>
 

helpdesk/templates/helpdesk/ticket_cc_del.html

@@ -2,6 +2,19 @@
 
 {% block helpdesk_title %}{% trans "Delete Ticket CC" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}{{ ticket.id }}/">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:ticket_cc' ticket.id %}">{% trans "CC Settings" %}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "Delete CC" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}{% blocktrans with cc.email_address as email_address %}
 <h2>Delete Ticket CC</h2>
 

helpdesk/templates/helpdesk/ticket_cc_list.html

@@ -2,6 +2,16 @@
 
 {% block helpdesk_title %}{% trans "Ticket CC Settings" %}{% endblock %}
 
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
+</li>
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:list' %}{{ ticket.id }}/">{{ ticket.queue.slug }}-{{ ticket.id }}</a>
+</li>
+<li class="breadcrumb-item active">{% trans "CC Settings" %}</li>
+{% endblock %}
+
 {% block helpdesk_body %}{% blocktrans with ticket.title as ticket_title and ticket.id as ticket_id %}
 <h2>Ticket CC Settings</h2>
 

helpdesk/templates/helpdesk/ticket_desc_table.html

@@ -12,7 +12,7 @@
                             <div class="table-responsive">
                                 <table class="table table-striped table-bordered table-hover">
                                     <thead>
-                                        <tr class='row_tablehead'><td colspan='2'><h3>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</h3> <span class='ticket_toolbar'>
+                                        <tr class='row_tablehead'><td colspan='2'><h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</h3> <span class='ticket_toolbar'>
                                             <a href="{% url 'helpdesk:edit' ticket.id %}" class="ticket-edit"><button class="btn btn-warning btn-xs"><i class="fa fa-pencil"></i> {% trans "Edit" %}</button></a>
                                         | <a href="{% url 'helpdesk:delete' ticket.id %}" class="ticket-delete"><button class="btn btn-danger btn-xs"><i class="fa fa-trash-o"></i> {% trans "Delete" %}</button></a>
                                         {% if ticket.on_hold %} | <a href="{% url 'helpdesk:unhold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-xs"><i class="fa fa-play"></i> {% trans "Unhold" %}</button></a>{% else %} | <a href="{% url 'helpdesk:hold' ticket.id %}" class="ticket-hold"><button class="btn btn-warning btn-xs"><i class="fa fa-pause"></i> {% trans "Hold" %}</button></a>{% endif %}

helpdesk/views/staff.py

@@ -1013,7 +1013,7 @@ def edit_ticket(request, ticket_id):
     else:
         form = EditTicketForm(instance=ticket)
 
-    return render(request, 'helpdesk/edit_ticket.html', {'form': form})
+    return render(request, 'helpdesk/edit_ticket.html', {'form': form, 'ticket': ticket})
 
 
 edit_ticket = staff_member_required(edit_ticket)