release 1.16.1 (#2938)

* optional csrf token name * fix regression when selecting all projects as super user * prevent invalid sql
kimai · Nov 16, 2021 · c858edf · c858edf
1 parent 99ebd1d
commit c858edf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/Repository/ProjectRepository.php b/src/Repository/ProjectRepository.php
@@ -372,7 +372,9 @@ private function getQueryBuilderForQuery(ProjectQuery $query): QueryBuilder
         // 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
@@ -228,6 +228,8 @@ private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, arr
             $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
@@ -533,8 +533,8 @@ protected function getDailyData(DateTime $begin, DateTime $end, ?User $user = nu
         $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
@@ -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 %}