mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2025-06-19 17:18:23 +02:00
Merge branch 'main' into feat/ticket-hold-followup-change-tracking
This commit is contained in:
Christopher Broderick
GitHub
commit
e0ac8e5486
15
helpdesk/templates/helpdesk/filters/priority.html
Normal file
15
helpdesk/templates/helpdesk/filters/priority.html
Normal file
@ -0,0 +1,15 @@
|
||||
{% load i18n humanize %}
|
||||
{% load static %}
|
||||
{% load in_list %}
|
||||
<div class="form-row">
|
||||
<div class="col col-sm-3">
|
||||
<label for='id_priority'>{% trans "Priority" %}:</label>
|
||||
</div>
|
||||
<div class="col col-sm-3">
|
||||
<select id='id_priority' name='priority' multiple='selected' size='5'>{% for p in priority_choices %}<option value='{{ p.0 }}'{% if p.0|in_list:query_params.filtering.priority__in %} selected='selected'{% endif %}>{{ p.1 }}</option>{% endfor %}</select>
|
||||
</div>
|
||||
<div class="col col-sm-6">
|
||||
<button class="filterBuilderRemove btn btn-danger btn-sm float-right"><i class="fas fa-trash-alt"></i></button>
|
||||
</div>
|
||||
<div class='form-row filterHelp'>{% trans "Ctrl-click to select multiple options" %}</div>
|
||||
</div>
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="col col-sm-3">
|
||||
<label for='id_sort' class="col-form-label">{% trans "Sorting" %}:</label>
|
||||
</div>
|
||||
<div class="col col-sm-3">
|
||||
<div class="col col-sm-3 pt-2">
|
||||
<select id='id_sort' name='sort' class="">
|
||||
<option value='created'{% if query_params.sorting == "created"%} selected='selected'{% endif %}>
|
||||
{% trans "Created" %}
|
||||
@ -29,7 +29,7 @@
|
||||
<div class="col col-sm-2">
|
||||
<label for='id_sortreverse' class="col-form-label">{% trans "Reverse" %}</label>
|
||||
</div>
|
||||
<div class="col col-sm-3">
|
||||
<div class="col col-sm-3 pt-2">
|
||||
<input type='checkbox' name='sortreverse' id='id_sortreverse'{% if query_params.sortreverse %} checked='checked'{% endif %} />
|
||||
</div>
|
||||
<div class="col col-sm-1">
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<div class="dropdown-menu" aria-labelledby="ticketsDropdown">
|
||||
{% if user_saved_queries_ %}
|
||||
{% for q in user_saved_queries_ %}
|
||||
<a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}">{{ q.title }}
|
||||
<a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}" style="white-space: normal;">{{ q.title }}
|
||||
{% if q.shared %}
|
||||
(Shared{% if user != q.user %} by {{ q.user.get_username }}{% endif %})
|
||||
{% endif %}
|
||||
@ -34,6 +34,12 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item{% if 'saved-searches' in request.path %} active{% endif %}">
|
||||
<a class="nav-link" href="{% url 'helpdesk:saved_searches_list' %}">
|
||||
<i class="fas fa-fw fa-save"></i>
|
||||
<span>{% trans "Manage Saved Queries" %}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item{% if 'submit' in request.path %} active{% endif %}">
|
||||
<a class="nav-link" href="{% url 'helpdesk:submit' %}">
|
||||
<i class="fas fa-fw fa-plus-circle"></i>
|
||||
|
||||
59
helpdesk/templates/helpdesk/saved_searches_list.html
Normal file
59
helpdesk/templates/helpdesk/saved_searches_list.html
Normal file
@ -0,0 +1,59 @@
|
||||
{% extends "helpdesk/base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block helpdesk_title %}
|
||||
{% trans "Saved Queries" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block helpdesk_breadcrumb %}
|
||||
<li class="breadcrumb-item">
|
||||
<a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
|
||||
</li>
|
||||
<li class="breadcrumb-item active">{% trans "Saved Queries" %}</li>
|
||||
{% endblock %}
|
||||
|
||||
{% block helpdesk_body %}
|
||||
<div class="container mt-4">
|
||||
<h3 class="mb-4">{% trans "Saved Queries" %}</h3>
|
||||
|
||||
{% if saved_queries %}
|
||||
<ul class="list-group">
|
||||
{% for q in saved_queries %}
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<a href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}" class="text-decoration-none">
|
||||
{{ q.title }}
|
||||
{% if q.shared %}
|
||||
<small class="text-muted ms-2 fst-italic">
|
||||
{% if q.user == user %}
|
||||
({% trans "Shared" %})
|
||||
{% else %}
|
||||
({% trans "Shared by" %} {{ q.user.get_username }})
|
||||
{% endif %}
|
||||
</small>
|
||||
{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
<div class="d-flex">
|
||||
<a href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}"
|
||||
class="btn btn-sm btn-outline-primary mr-2"
|
||||
title="{% trans 'Run this query' %}">
|
||||
<i class="fas fa-play"></i> {% trans "Run" %}
|
||||
</a>
|
||||
|
||||
{% if q.user == user %}
|
||||
<a href="{% url 'helpdesk:delete_query' q.id %}"
|
||||
class="btn btn-sm btn-outline-danger"
|
||||
title="{% trans 'Delete this query' %}">
|
||||
<i class="fas fa-trash"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
<p>{% trans "No saved queries found." %}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -15,27 +15,29 @@
|
||||
<h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }}</h3>
|
||||
{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}
|
||||
<span class='ticket_toolbar float-right'>
|
||||
<a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit">
|
||||
<i class="fas fa-pencil-alt"></i> {% trans "Edit" %}
|
||||
</a>
|
||||
| <a href="{% url 'helpdesk:delete' ticket.id %}" class="btn btn-danger btn-sm ticket-delete">
|
||||
<i class="fas fa-trash-alt"></i> {% trans "Delete" %}
|
||||
</a>
|
||||
| {% if ticket.on_hold %}
|
||||
<form class="form-inline ticket-hold" method='post' action='unhold/'>
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-warning btn-sm" type='submit'>
|
||||
<i class="fas fa-play"></i> {% trans "Unhold" %}
|
||||
</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<form class="form-inline ticket-hold" method='post' action='hold/'>
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-warning btn-sm" type='submit'>
|
||||
<i class="fas fa-pause"></i> {% trans "Hold" %}
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<div class="btn-group" style="gap: 8px;">
|
||||
<a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit">
|
||||
<i class="fas fa-pencil-alt"></i> {% trans "Edit" %}
|
||||
</a>
|
||||
| <a href="{% url 'helpdesk:delete' ticket.id %}" class="btn btn-danger btn-sm ticket-delete">
|
||||
<i class="fas fa-trash-alt"></i> {% trans "Delete" %}
|
||||
</a>
|
||||
| {% if ticket.on_hold %}
|
||||
<form class="form-inline ticket-hold" method='post' action='unhold/'>
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-warning btn-sm" type='submit'>
|
||||
<i class="fas fa-play"></i> {% trans "Unhold" %}
|
||||
</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<form class="form-inline ticket-hold" method='post' action='hold/'>
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-warning btn-sm" type='submit'>
|
||||
<i class="fas fa-pause"></i> {% trans "Hold" %}
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</span>
|
||||
</th>
|
||||
</tr>
|
||||
|
||||
@ -171,6 +171,9 @@
|
||||
<option id="filterBuilderSelect-Sort" value="Sort"{% if query_params.sorting %} disabled{% endif %}>
|
||||
{% trans "Sorting" %}
|
||||
</option>
|
||||
<option id="filterBuilderSelect-Priority" value="Priority"{% if query_params.filtering.priority__in %} disabled{% endif %}>
|
||||
{% trans "Priority" %}
|
||||
</option>
|
||||
<option id="filterBuilderSelect-Owner" value="Owner"{% if query_params.filtering.assigned_to__id__in or query_params.filtering_null.assigned_to__id__isnull %} disabled{% endif %}>
|
||||
{% trans "Owner" %}
|
||||
</option>
|
||||
@ -201,6 +204,10 @@
|
||||
id="filterBoxSort">
|
||||
{% include 'helpdesk/filters/sorting.html' %}
|
||||
</li>
|
||||
<li class="list-group-item filterBox{% if query_params.filtering.priority__in %} filterBoxShow{% endif %}"
|
||||
id="filterBoxPriority">
|
||||
{% include 'helpdesk/filters/priority.html' %}
|
||||
</li>
|
||||
<li class="filterBox{% if query_params.filtering.assigned_to__id__in or query_params.filtering_null.assigned_to__id__isnull %} filterBoxShow{% endif %} list-group-item"
|
||||
id=filterBoxOwner>
|
||||
{% include 'helpdesk/filters/owner.html' %}
|
||||
|
||||
@ -119,6 +119,7 @@ urlpatterns = [
|
||||
path("rss/", staff.rss_list, name="rss_index"),
|
||||
path("reports/", staff.report_index, name="report_index"),
|
||||
re_path(r"^reports/(?P<report>\w+)/$", staff.run_report, name="run_report"),
|
||||
path("saved-searches/", staff.saved_searches_list, name="saved_searches_list"),
|
||||
path("save_query/", staff.save_query, name="savequery"),
|
||||
path("delete_query/<int:pk>/", staff.delete_saved_query, name="delete_query"),
|
||||
path("settings/", staff.EditUserSettingsView.as_view(), name="user_settings"),
|
||||
|
||||
@ -1079,6 +1079,7 @@ def ticket_list(request):
|
||||
"queue",
|
||||
"assigned_to",
|
||||
"status",
|
||||
"priority",
|
||||
"q",
|
||||
"sort",
|
||||
"sortreverse",
|
||||
@ -1091,6 +1092,7 @@ def ticket_list(request):
|
||||
("queue", "queue__id__in"),
|
||||
("assigned_to", "assigned_to__id__in"),
|
||||
("status", "status__in"),
|
||||
("priority", "priority__in"),
|
||||
("kbitem", "kbitem__in"),
|
||||
]
|
||||
filter_null_params = dict(
|
||||
@ -1098,6 +1100,7 @@ def ticket_list(request):
|
||||
("queue", "queue__id__isnull"),
|
||||
("assigned_to", "assigned_to__id__isnull"),
|
||||
("status", "status__isnull"),
|
||||
("priority", "priority__isnull"),
|
||||
("kbitem", "kbitem__isnull"),
|
||||
]
|
||||
)
|
||||
@ -1189,6 +1192,7 @@ def ticket_list(request):
|
||||
kb_items=kbitem,
|
||||
queue_choices=huser.get_queues(),
|
||||
status_choices=Ticket.STATUS_CHOICES,
|
||||
priority_choices=Ticket.PRIORITY_CHOICES,
|
||||
kbitem_choices=kbitem_choices,
|
||||
urlsafe_query=urlsafe_query,
|
||||
user_saved_queries=user_saved_queries,
|
||||
@ -1696,6 +1700,23 @@ def run_report(request, report):
|
||||
run_report = staff_member_required(run_report)
|
||||
|
||||
|
||||
@helpdesk_staff_member_required
|
||||
def saved_searches_list(request):
|
||||
user = request.user
|
||||
saved_queries = SavedSearch.objects.filter(Q(user=user) | Q(shared=True)).distinct()
|
||||
|
||||
return render(
|
||||
request,
|
||||
"helpdesk/saved_searches_list.html",
|
||||
{
|
||||
"saved_queries": saved_queries,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
saved_searches_list = staff_member_required(saved_searches_list)
|
||||
|
||||
|
||||
@helpdesk_staff_member_required
|
||||
def save_query(request):
|
||||
title = request.POST.get("title", None)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user