jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

release 1.16.1 (#2938)

Browse Source 
* optional csrf token name
* fix regression when selecting all projects as super user
* prevent invalid sql
This commit is contained in:
Kevin Papst
2021-11-16 21:48:50 +01:00
committed by GitHub
parent 99ebd1d503
commit c858edf5c9
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Repository/ProjectRepository.php
View File

@@ -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());

4
src/Repository/TeamRepository.php
View File

@@ -228,6 +228,8 @@ class TeamRepository extends EntityRepository
$qb->setParameter('teamIds', array_unique($ids));
}
$qb->andWhere($or);
if ($or->count() > 0) {
$qb->andWhere($or);
}
}
}

4
src/Repository/TimesheetRepository.php
View File

@@ -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)

2
templates/embeds/comments.html.twig
View File

@@ -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 %}