From c858edf5c9f7cbf7360c1be51aaeeb51844da1d6 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Tue, 16 Nov 2021 21:48:50 +0100
Subject: [PATCH] release 1.16.1 (#2938)

* optional csrf token name
* fix regression when selecting all projects as super user
* prevent invalid sql
---
 src/Repository/ProjectRepository.php   | 4 +++-
 src/Repository/TeamRepository.php      | 4 +++-
 src/Repository/TimesheetRepository.php | 4 ++--
 templates/embeds/comments.html.twig    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php
index 914d6243..5c648774 100644
--- a/src/Repository/ProjectRepository.php
+++ b/src/Repository/ProjectRepository.php
@@ -372,7 +372,9 @@ class ProjectRepository extends EntityRepository
         // begin > from and end < to
         // ... and more ...
         $times = $this->addProjectStartAndEndDate($qb, $query->getProjectStart(), $query->getProjectEnd());
-        $qb->andWhere($times);
+        if ($times->count() > 0) {
+            $qb->andWhere($times);
+        }
 
         $this->addPermissionCriteria($qb, $query->getCurrentUser());
 
diff --git a/src/Repository/TeamRepository.php b/src/Repository/TeamRepository.php
index ef231509..fc5a30a6 100644
--- a/src/Repository/TeamRepository.php
+++ b/src/Repository/TeamRepository.php
@@ -228,6 +228,8 @@ class TeamRepository extends EntityRepository
             $qb->setParameter('teamIds', array_unique($ids));
         }
 
-        $qb->andWhere($or);
+        if ($or->count() > 0) {
+            $qb->andWhere($or);
+        }
     }
 }
diff --git a/src/Repository/TimesheetRepository.php b/src/Repository/TimesheetRepository.php
index 6860a598..aaa1d88a 100644
--- a/src/Repository/TimesheetRepository.php
+++ b/src/Repository/TimesheetRepository.php
@@ -533,8 +533,8 @@ class TimesheetRepository extends EntityRepository
         $or->add($qb->expr()->between('t.end', ':begin', ':end'));
 
         $qb->select('t, p, a, c')
-                ->from(Timesheet::class, 't')
-                ->andWhere($qb->expr()->isNotNull('t.end'))
+            ->from(Timesheet::class, 't')
+            ->andWhere($qb->expr()->isNotNull('t.end'))
             ->andWhere($or)
             ->orderBy('t.begin', 'DESC')
             ->setParameter('begin', $begin)
diff --git a/templates/embeds/comments.html.twig b/templates/embeds/comments.html.twig
index 99d97d43..8a1626f3 100644
--- a/templates/embeds/comments.html.twig
+++ b/templates/embeds/comments.html.twig
@@ -1,4 +1,4 @@
-{% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'form': form, 'comments': comments, 'route_pin': route_pin|default(null), 'route_delete': route_delete|default(null), 'delete_by_user': delete_by_user|default(false), 'csrf_delete': csrf_token(csrf_delete), 'csrf_pin': csrf_token(csrf_pin)} %}
+{% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'form': form, 'comments': comments, 'route_pin': route_pin|default(null), 'route_delete': route_delete|default(null), 'delete_by_user': delete_by_user|default(false), 'csrf_delete': csrf_token(csrf_delete|default('comment.delete')), 'csrf_pin': csrf_token(csrf_pin|default('comment.pin'))} %}
     {% import "macros/widgets.html.twig" as widgets %}
     {% block box_title %}{{ 'label.comment'|trans }}{% endblock %}
     {% block box_attributes %}id="comments_box"{% endblock %}