Release 1.6.2 (#1289)

* include user teams in user entity
* prevent unauthorized access via API
* improve teamlead permission handling in team timesheets
* add team data to user entity
* add security tests
* highlight menu for invoice template copy
* unified handling of invoice data across all templates
* access to the current users data in invoice templates
* permission improvement in invoice form
* allow to skip record rows
* allow to add new invoice locations without overwriting the global ones
* allow to order user preferences
* change permission for normal users with access to view_other_timesheets
* properly validate invoice template field length
* allow to replace multiple variables in cell values text
* upgraded office invoice template
* doctrine deprecation fix
* upgrade phpoffice/phpword
* fix future begin check for default rounding rules
* dashboard widget counter: respect visibility and teams - fixes #1161
* fix future begin check for default rounding rules
* added new events for pre and post invoice rendering
* fix permission issue for users without team seeing all records
* prevent error in spreadsheet renderer for empty invoices

src/Repository/ActivityRepository.php

@@ -346,6 +346,18 @@ class ActivityRepository extends EntityRepository
         return $qb;
     }
 
+    public function countActivitiesForQuery(ActivityQuery $query): int
+    {
+        $qb = $this->getQueryBuilderForQuery($query);
+        $qb
+            ->resetDQLPart('select')
+            ->resetDQLPart('orderBy')
+            ->select($qb->expr()->countDistinct('a.id'))
+        ;
+
+        return (int) $qb->getQuery()->getSingleScalarResult();
+    }
+
     public function getPagerfantaForQuery(ActivityQuery $query): Pagerfanta
     {
         $paginator = new Pagerfanta($this->getPaginatorForQuery($query));
@@ -357,14 +369,7 @@ class ActivityRepository extends EntityRepository
 
     protected function getPaginatorForQuery(ActivityQuery $query): PaginatorInterface
     {
-        $qb = $this->getQueryBuilderForQuery($query);
-        $qb
-            ->resetDQLPart('select')
-            ->resetDQLPart('orderBy')
-            ->select($qb->expr()->countDistinct('a.id'))
-        ;
-        $counter = (int) $qb->getQuery()->getSingleScalarResult();
-
+        $counter = $this->countActivitiesForQuery($query);
         $qb = $this->getQueryBuilderForQuery($query);
 
         return new LoaderPaginator(new ActivityLoader($qb->getEntityManager()), $qb, $counter);

src/Repository/CustomerRepository.php

@@ -272,7 +272,7 @@ class CustomerRepository extends EntityRepository
         return $paginator;
     }
 
-    protected function getPaginatorForQuery(CustomerQuery $query): PaginatorInterface
+    public function countCustomersForQuery(CustomerQuery $query): int
     {
         $qb = $this->getQueryBuilderForQuery($query);
         $qb
@@ -280,8 +280,13 @@ class CustomerRepository extends EntityRepository
             ->resetDQLPart('orderBy')
             ->select($qb->expr()->countDistinct('c.id'))
         ;
-        $counter = (int) $qb->getQuery()->getSingleScalarResult();
 
+        return (int) $qb->getQuery()->getSingleScalarResult();
+    }
+
+    protected function getPaginatorForQuery(CustomerQuery $query): PaginatorInterface
+    {
+        $counter = $this->countCustomersForQuery($query);
         $qb = $this->getQueryBuilderForQuery($query);
 
         return new LoaderPaginator(new CustomerLoader($qb->getEntityManager()), $qb, $counter);

src/Repository/ProjectRepository.php

@@ -283,6 +283,18 @@ class ProjectRepository extends EntityRepository
         return $qb;
     }
 
+    public function countProjectsForQuery(ProjectQuery $query): int
+    {
+        $qb = $this->getQueryBuilderForQuery($query);
+        $qb
+            ->resetDQLPart('select')
+            ->resetDQLPart('orderBy')
+            ->select($qb->expr()->countDistinct('p.id'))
+        ;
+
+        return (int) $qb->getQuery()->getSingleScalarResult();
+    }
+
     public function getPagerfantaForQuery(ProjectQuery $query): Pagerfanta
     {
         $paginator = new Pagerfanta($this->getPaginatorForQuery($query));
@@ -294,14 +306,7 @@ class ProjectRepository extends EntityRepository
 
     private function getPaginatorForQuery(ProjectQuery $query): PaginatorInterface
     {
-        $qb = $this->getQueryBuilderForQuery($query);
-        $qb
-            ->resetDQLPart('select')
-            ->resetDQLPart('orderBy')
-            ->select($qb->expr()->countDistinct('p.id'))
-        ;
-        $counter = (int) $qb->getQuery()->getSingleScalarResult();
-
+        $counter = $this->countProjectsForQuery($query);
         $qb = $this->getQueryBuilderForQuery($query);
 
         return new LoaderPaginator(new ProjectLoader($qb->getEntityManager()), $qb, $counter);

src/Repository/TimesheetRepository.php

@@ -640,6 +640,10 @@ class TimesheetRepository extends EntityRepository
             $currentUser = $query->getCurrentUser();
 
             if (!$currentUser->isSuperAdmin() && !$currentUser->isAdmin()) {
+                // make sure that the user himself is in the list of users, if he is part of a team
+                // if teams are used and the user is not a teamlead, the list of users would be empty and then leading to NOT limit the select by user IDs
+                $user[] = $currentUser;
+
                 foreach ($currentUser->getTeams() as $team) {
                     if ($currentUser->isTeamleadOf($team)) {
                         $query->addTeam($team);

src/Repository/UserRepository.php

@@ -236,7 +236,7 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
         return $paginator;
     }
 
-    protected function getPaginatorForQuery(UserQuery $query): PaginatorInterface
+    public function countUsersForQuery(UserQuery $query): int
     {
         $qb = $this->getQueryBuilderForQuery($query);
         $qb
@@ -244,8 +244,13 @@ class UserRepository extends EntityRepository implements UserLoaderInterface
             ->resetDQLPart('orderBy')
             ->select($qb->expr()->countDistinct('u.id'))
         ;
-        $counter = (int) $qb->getQuery()->getSingleScalarResult();
 
+        return (int) $qb->getQuery()->getSingleScalarResult();
+    }
+
+    protected function getPaginatorForQuery(UserQuery $query): PaginatorInterface
+    {
+        $counter = $this->countUsersForQuery($query);
         $qb = $this->getQueryBuilderForQuery($query);
 
         return new LoaderPaginator(new UserLoader($qb->getEntityManager()), $qb, $counter);