Skip to content

Commit d81a43e

Browse files
committed
fix(dropdownfield): useless duplicate conditions for tickets
internal ref 32345
1 parent 9ac92f0 commit d81a43e

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

inc/field/dropdownfield.class.php

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -227,40 +227,11 @@ public function buildParams($rand = null) {
227227
if (Session::haveRight("ticket", Ticket::READALL)) {
228228
break;
229229
}
230-
$currentUser = Session::getLoginUserID();
231230
if (!Session::haveRight(Ticket::$rightname, Ticket::READMY) && !Session::haveRight(Ticket::$rightname, Ticket::READGROUP)) {
232231
// No right to view any ticket, then force the dropdown to be empty
233232
$dparams_cond_crit['OR'] = new QueryExpression('0=1');
234233
break;
235234
}
236-
$tickets_filter = ['users_id_recipient' => $currentUser];
237-
238-
if (Session::haveRight(Ticket::$rightname, Ticket::READMY)) {
239-
$requestersObserversQuery = new QuerySubQuery([
240-
'SELECT' => 'tickets_id',
241-
'FROM' => Ticket_User::getTable(),
242-
'WHERE' => [
243-
'users_id' => $currentUser,
244-
'type' => [CommonITILActor::REQUESTER, CommonITILActor::OBSERVER]
245-
],
246-
]);
247-
$tickets_filter[] = [
248-
Ticket::getTableField('id') => $requestersObserversQuery,
249-
];
250-
}
251-
252-
if (Session::haveRight(Ticket::$rightname, Ticket::READGROUP) && count($_SESSION['glpigroups']) > '0') {
253-
$requestersObserversGroupsQuery = new QuerySubQuery([
254-
'SELECT' => 'tickets_id',
255-
'FROM' => Group_Ticket::getTable(),
256-
'WHERE' => [
257-
'type' => [CommonITILActor::REQUESTER, CommonITILActor::OBSERVER],
258-
'groups_id' => $_SESSION['glpigroups'],
259-
],
260-
]);
261-
$tickets_filter[] = [Ticket::getTableField('id') => $requestersObserversGroupsQuery];
262-
}
263-
$dparams_cond_crit['OR'] = $tickets_filter;
264235
break;
265236

266237
default:

0 commit comments

Comments
 (0)