diff --git a/helpdesk/templates/helpdesk/ticket/ticket_card.html b/helpdesk/templates/helpdesk/ticket/ticket_card.html
index ea9047d06..a9d75529e 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_card.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_card.html
@@ -86,9 +86,10 @@
data-type="label"
style="font-weight: 600"
title="{{ticket}}"
- >{{ticket|truncatechars:25}}
+
@@ -164,7 +165,7 @@
-
-
-
@@ -356,7 +361,10 @@
@@ -619,6 +627,7 @@
type="checkbox"
title='{% trans "Select All" %}'
class="oh-input oh-input__checkbox allTicketsAll"
+ onchange="$(this).closest('.oh-sticky-table').find('.all-tickets-row').prop('checked',$(this).is(':checked')).change();addingTicketsIds()"
/>
@@ -647,8 +656,11 @@
@@ -914,18 +926,6 @@ $(".allTicketsAll").change(function (e) {
});
// TO toggle class for select all button in My tickets tab
- $(".myTicketsAll").change(function (e) {
- var is_checked = $(this).is(":checked");
- if (is_checked) {
- $(".my-tickets-row").prop("checked", true)
- .closest(".oh-sticky-table__tr")
- .addClass("highlight-selected");
- } else {
- $(".my-tickets-row").prop("checked", false)
- .closest(".oh-sticky-table__tr")
- .removeClass("highlight-selected");
- }
- });
$(document).ready(function () {
const activeTab = localStorage.getItem('activeTabTicket')
if (activeTab!=null) {
@@ -939,35 +939,6 @@ $(".allTicketsAll").change(function (e) {
localStorage.setItem("activeTabTicket",$(this).attr('data-target'))
});
tickTicketsCheckboxes();
- $(".my-tickets-row").change(function () {
- if ($('.myTicketsAll').is(":checked")) {
- $('.myTicketsAll').prop("checked", false);
- }
- addingTicketsIds();
- });
- $(".myTicketsAll").change(function () {
- addingTicketsIds();
- });
-
- $(".allocated-tickets-row").change(function () {
- if ($('.allocatedTicketsAll').is(":checked")) {
- $('.allocatedTicketsAll').prop("checked", false);
- }
- addingTicketsIds();
- });
- $(".allocatedTicketsAll").change(function () {
- addingTicketsIds();
- });
- $(".all-tickets-row").change(function () {
- if ($('.allTicketsAll').is(":checked")) {
- $('.allTicketsAll').prop("checked", false);
- }
- addingTicketsIds();
- });
- $(".allTicketsAll").change(function () {
- addingTicketsIds();
- });
-
$("#selectAllTickets").click(function () {
selectAllTickets();
});
@@ -978,4 +949,4 @@ $(".allTicketsAll").change(function (e) {
exportObjectives();
}); {% endcomment %}
});
-
\ No newline at end of file
+
diff --git a/helpdesk/templates/helpdesk/ticket/ticket_nav.html b/helpdesk/templates/helpdesk/ticket/ticket_nav.html
index 35b50530c..c62c5740d 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_nav.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_nav.html
@@ -17,9 +17,7 @@
- {% if my_tickets or allocated_tickets or all_tickets %}
{% include "helpdesk/ticket/ticket_filter.html" %}
- {% endif %}
{% if request.GET.view != 'card' %}