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

added missing permission check on project rates in monthly report (#3627)

Browse Source
This commit is contained in:
Kevin Papst
2022-11-05 11:39:18 +01:00
committed by GitHub
parent 642d31432a
commit 3d0f480d9e
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Voter/EntityMultiRoleVoter.php
View File

@@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
final class EntityMultiRoleVoter extends Voter final class EntityMultiRoleVoter extends Voter
{ {
/** /**
* support rules based on the given activity * support rules based on the given activity/project/customer
*/ */
private const ALLOWED_ATTRIBUTES = [ private const ALLOWED_ATTRIBUTES = [
'budget_money', 'budget_money',

7
templates/reporting/project_daterange.html.twig
View File

@@ -5,6 +5,7 @@
{% set showMoneyBudget = is_granted('budget_money', 'project') %} {% set showMoneyBudget = is_granted('budget_money', 'project') %}
{% set showTimeBudget = is_granted('budget_time', 'project') %} {% set showTimeBudget = is_granted('budget_time', 'project') %}
{% set viewRevenue = is_granted('view_rate_other_timesheet') %}
{% set columns = { {% set columns = {
'name': {'class': 'alwaysVisible'}, 'name': {'class': 'alwaysVisible'},
@@ -21,7 +22,13 @@
{% endif %} {% endif %}
{% set columns = columns|merge({ {% set columns = columns|merge({
'duration': {'class': 'text-center hw-min', 'title': 'stats.durationMonth'|trans, 'columnClass': 'w-min'}, 'duration': {'class': 'text-center hw-min', 'title': 'stats.durationMonth'|trans, 'columnClass': 'w-min'},
}) %}
{% if viewRevenue %}
{% set columns = columns|merge({
'rate': {'class': 'text-center hw-min', 'title': 'stats.amountMonth'|trans, 'columnClass': 'w-min'}, 'rate': {'class': 'text-center hw-min', 'title': 'stats.amountMonth'|trans, 'columnClass': 'w-min'},
}) %}
{% endif %}
{% set columns = columns|merge({
'billable': {'class': 'text-center hw-min', 'columnClass': 'w-min'}, 'billable': {'class': 'text-center hw-min', 'columnClass': 'w-min'},
'actions': {'class': 'actions alwaysVisible'}, 'actions': {'class': 'actions alwaysVisible'},
}) %} }) %}