diff --git a/CHANGELOG.md b/CHANGELOG.md index fc3d9991..a886b118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [UNRELEASED] +### Fixed + + - Improve SLA selector in reports + ## [1.8.10] - 2025-12-05 ### Fixed diff --git a/inc/common.class.php b/inc/common.class.php index 2647cd97..e83fd914 100644 --- a/inc/common.class.php +++ b/inc/common.class.php @@ -1426,9 +1426,18 @@ public static function selectorAllSlasWithTicket() 'SELECT' => [ 'glpi_slas.id', 'glpi_slas.name', + 'glpi_slms.name AS slm_name', ], 'DISTINCT' => true, 'FROM' => 'glpi_slas', + 'LEFT JOIN' => [ + 'glpi_slms' => [ + 'ON' => [ + 'glpi_slas' => 'slms_id', + 'glpi_slms' => 'id', + ], + ], + ], 'INNER JOIN' => [ 'glpi_tickets' => [ 'ON' => [ @@ -1446,7 +1455,8 @@ public static function selectorAllSlasWithTicket() $values = []; foreach ($result as $data) { - $values[$data['id']] = $data['name']; + $slm_name = $data['slm_name']; + $values[$slm_name][$data['id']] = $data['name']; } $selected_values = isset($_SESSION['mreporting_values']['slas']) ? $_SESSION['mreporting_values']['slas'] : [];