Skip to content

Commit 1ede2c2

Browse files
einpraegsamBastiLu
authored andcommitted
[BUGFIX] Show all linklisteners per default but only used when search for a specified time
(cherry picked from commit af22003)
1 parent 2a16cad commit 1ede2c2

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

Classes/Domain/Repository/LinklistenerRepository.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,20 @@ protected function extendLogicalAndWithFilterConstraintsForCrdate(
4141
QueryInterface $query,
4242
array $logicalAnd
4343
): array {
44-
$logicalAnd[] = $query->greaterThan('crdate', $filter->getStartTimeForFilter());
45-
$logicalAnd[] = $query->lessThan('crdate', $filter->getEndTimeForFilter());
44+
$or = [
45+
$query->logicalAnd(
46+
$query->greaterThan('linkclicks.crdate', $filter->getStartTimeForFilter()),
47+
$query->lessThan('linkclicks.crdate', $filter->getEndTimeForFilter()),
48+
)
49+
];
50+
if ($filter->isTimeFromOrTimeToSet() === false) { // add unused linklisteners (without clicks) per default
51+
$or[] = $query->logicalAnd(
52+
$query->equals('linkclicks.uid', null),
53+
$query->greaterThan('crdate', $filter->getStartTimeForFilter()),
54+
$query->lessThan('crdate', $filter->getEndTimeForFilter())
55+
);
56+
}
57+
$logicalAnd[] = $query->logicalOr(...$or);
4658
return $logicalAnd;
4759
}
4860

0 commit comments

Comments
 (0)