From 5f32aceab1ca0212f9b4a8b1a2897c7df8d37c95 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Wed, 27 Nov 2024 15:00:27 +0100
Subject: [PATCH] FIX select on ticket list for fields group and severity
 (issue #31619)

---
 htdocs/core/class/html.formticket.class.php | 14 +++++++++-----
 htdocs/langs/en_US/ticket.lang              |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 2838c10b7419f..88ef66a06d856 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -391,12 +391,12 @@ function(response) {
 		if ($public) {
 			$filter = '(public:=:1)';
 		}
-		$this->selectGroupTickets($category_code, 'category_code', $filter, 2, 1, 0, 0, 'minwidth200 maxwidth500');
+		$this->selectGroupTickets($category_code, 'category_code', $filter, 2, 0, 0, 0, 'minwidth200 maxwidth500');
 		print '</td></tr>';
 
 		// Severity => Priority
 		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
-		$this->selectSeveritiesTickets($severity_code, 'severity_code', '', 2, 1, 0, 0, 'minwidth200 maxwidth500');
+		$this->selectSeveritiesTickets($severity_code, 'severity_code', '', 2, 0, 0, 0, 'minwidth200 maxwidth500');
 		print '</td></tr>';
 
 		if (isModEnabled('knowledgemanagement')) {
@@ -885,6 +885,8 @@ public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory',
 			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			if ($empty) {
 				print '<option value="">&nbsp;</option>';
+			} else {
+				print '<option value="">--&nbsp;'.$langs->trans('TicketSelectGroup').'&nbsp;--</option>';
 			}
 
 			if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
@@ -929,9 +931,9 @@ public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory',
 						print ' selected="selected"';
 					} elseif (isset($selected) && $selected == $id) {
 						print ' selected="selected"';
-					} elseif ($arraycategories['use_default'] == "1" && empty($selected)) {
+					} elseif ($arraycategories['use_default'] == "1" && empty($selected) && !$empty) {
 						print ' selected="selected"';
-					} elseif (count($ticketstat->cache_category_tickets) == 1) {	// If only 1 choice, we autoselect it
+					} elseif (count($ticketstat->cache_category_tickets) == 1 && !$empty) {	// If only 1 choice, we autoselect it
 						print ' selected="selected"';
 					}
 
@@ -1238,6 +1240,8 @@ public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketsever
 		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($empty) {
 			print '<option value="">&nbsp;</option>';
+		} else {
+			print '<option value="">--&nbsp;'.$langs->trans('TicketSelectGroup').'&nbsp;--</option>';
 		}
 
 		if (is_array($conf->cache['severity_tickets']) && count($conf->cache['severity_tickets'])) {
@@ -1273,7 +1277,7 @@ public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketsever
 					print ' selected="selected"';
 				} elseif (isset($selected) && $selected == $id) {
 					print ' selected="selected"';
-				} elseif ($arrayseverities['use_default'] == "1" && empty($selected)) {
+				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && !$empty) {
 					print ' selected="selected"';
 				}
 
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index bb0cd645857cc..752d88e02389e 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -152,6 +152,8 @@ ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
 ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
 ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
+TicketSelectGroup=Select group
+TicketSelectSeverity=Select severity
 # Ticket card
 Ticket=Ticket
 TicketCard=Ticket card