Skip to content

Commit 0a5c9a5

Browse files
ccaillytrasher
authored andcommitted
fix: Optimization of central counter request execution time
1 parent afc9fcb commit 0a5c9a5

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/Ticket.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5143,12 +5143,7 @@ private static function showCentralCountCriteria(bool $foruser): array
51435143
'glpi_tickets_users' => [
51445144
'ON' => [
51455145
'glpi_tickets_users' => 'tickets_id',
5146-
$table => 'id', [
5147-
'OR' => [
5148-
['glpi_tickets_users.type' => CommonITILActor::REQUESTER],
5149-
['glpi_tickets_users.type' => CommonITILActor::OBSERVER]
5150-
]
5151-
]
5146+
$table => 'id'
51525147
]
51535148
],
51545149
'glpi_ticketvalidations' => [
@@ -5174,9 +5169,15 @@ private static function showCentralCountCriteria(bool $foruser): array
51745169
];
51755170
}
51765171

5177-
$ORWHERE = [
5172+
$WHERE = [
51785173
'OR' => [
5179-
'glpi_tickets_users.users_id' => Session::getLoginUserID(),
5174+
'AND' => [
5175+
'glpi_tickets_users.users_id' => Session::getLoginUserID(),
5176+
'OR' => [
5177+
['glpi_tickets_users.type' => CommonITILActor::REQUESTER],
5178+
['glpi_tickets_users.type' => CommonITILActor::OBSERVER]
5179+
],
5180+
],
51805181
'glpi_tickets.users_id_recipient' => Session::getLoginUserID(),
51815182
'glpi_ticketvalidations.users_id_validate' => Session::getLoginUserID()
51825183
]
@@ -5187,9 +5188,9 @@ private static function showCentralCountCriteria(bool $foruser): array
51875188
&& isset($_SESSION["glpigroups"])
51885189
&& count($_SESSION["glpigroups"])
51895190
) {
5190-
$ORWHERE['OR']['glpi_groups_tickets.groups_id'] = $_SESSION['glpigroups'];
5191+
$WHERE['OR']['glpi_groups_tickets.groups_id'] = $_SESSION['glpigroups'];
51915192
}
5192-
$criteria['WHERE'][] = $ORWHERE;
5193+
$criteria['WHERE'][] = $WHERE;
51935194
}
51945195

51955196
return $criteria;

0 commit comments

Comments
 (0)