Merge branch 'main' into webhooks-2

This commit is contained in:
Christopher Broderick 2023-12-04 08:42:58 +00:00 committed by GitHub
commit c959c24b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View File

@ -11,8 +11,6 @@
<th>Queue</th> <th>Queue</th>
<th>Status</th> <th>Status</th>
<th>Created</th> <th>Created</th>
<th>Due Date</th>
<th>Submitter</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -43,8 +41,6 @@ window.addEventListener('load', function()
<td>${ticket.queue.title}</td> <td>${ticket.queue.title}</td>
<td>${ticket.status}</td> <td>${ticket.status}</td>
<td>${ticket.created}</td> <td>${ticket.created}</td>
<td>${ticket.due_date ? ticket.due_date : 'N/A'}</td>
<td>${ticket.submitter}</td>
</tr> </tr>
`); `);
}); });

View File

@ -40,6 +40,12 @@
<span>{% trans "New Ticket" %}</span> <span>{% trans "New Ticket" %}</span>
</a> </a>
</li> </li>
<li class="nav-item{% if 'my-tickets' in request.path %} active{% endif %}">
<a class="nav-link" href="{% url 'helpdesk:my-tickets' %}">
<i class="fas fa-fw fa-tasks"></i>
<span>{% trans "My Tickets" %}</span>
</a>
</li>
<li class="nav-item{% if 'reports' in request.path %} active{% endif %}"> <li class="nav-item{% if 'reports' in request.path %} active{% endif %}">
<a class="nav-link" href="{% url 'helpdesk:report_index' %}"> <a class="nav-link" href="{% url 'helpdesk:report_index' %}">
<i class="fas fa-fw fa-chart-area"></i> <i class="fas fa-fw fa-chart-area"></i>

View File

@ -6,7 +6,7 @@ from setuptools import find_packages, setup
import sys import sys
version = '1.0.0' version = '1.1.0'
# Provided as an attribute, so you can append to these instead # Provided as an attribute, so you can append to these instead