add user preference: default report (#2430)

2021-03-14 13:32:47 +01:00
parent 0a6ea6be42
commit c0378b4f51
16 changed files with 264 additions and 57 deletions
--- a/src/Reporting/ProjectView/ProjectViewService.php
+++ b/src/Reporting/ProjectView/ProjectViewService.php
@@ -66,7 +66,12 @@ final class ProjectViewService
        }

        if (!$query->isIncludeNoBudget()) {
-            $qb->andWhere($qb->expr()->gt('p.timeBudget', 0));
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->gt('p.budget', 0),
+                    $qb->expr()->gt('p.timeBudget', 0)
+                )
+            );
        }

        $this->repository->addPermissionCriteria($qb, $user);