Skip to content

Commit 7638ca2

Browse files
anukoanuko
committed
More progress on removing dependency on canManageTeam().
1 parent 2bd9983 commit 7638ca2

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎WEB-INF/templates/footer.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<br>
1313
<table cellspacing="0" cellpadding="4" width="100%" border="0">
1414
<tr>
15-
<td align="center">&nbsp;Anuko Time Tracker 1.17.88.4267 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
15+
<td align="center">&nbsp;Anuko Time Tracker 1.17.88.4268 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
1616
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
1717
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
1818
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

‎WEB-INF/templates/report.tpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
<tr class="rowReportSubtotal">
2323
<td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
2424
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
25-
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
25+
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
2626
</tr>
2727
{/foreach}
2828
<!-- print totals -->
2929
<tr><td>&nbsp;</td></tr>
3030
<tr class="rowReportSubtotal">
3131
<td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
3232
{if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
33-
{if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
33+
{if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
3434
</tr>
3535
{else}
3636
<!-- normal report -->
3737
<tr>
3838
<td class="tableHeader">{$i18n.label.date}</td>
39-
{if $user->canManageTeam() || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
39+
{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="tableHeader">{$i18n.label.user}</td>{/if}
4040
{if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
4141
{if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
4242
{if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
@@ -58,7 +58,7 @@
5858
{if $cur_grouped_by != $prev_grouped_by && !$first_pass}
5959
<tr class="rowReportSubtotal">
6060
<td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
61-
{if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
61+
{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
6262
{if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
6363
{if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
6464
{if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
@@ -67,7 +67,7 @@
6767
{if $bean->getAttribute('chfinish')}<td></td>{/if}
6868
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
6969
{if $bean->getAttribute('chnote')}<td></td>{/if}
70-
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
70+
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if}</td>{/if}
7171
{if $bean->getAttribute('chpaid')}<td></td>{/if}
7272
{if $bean->getAttribute('chip')}<td></td>{/if}
7373
{if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -83,7 +83,7 @@
8383
{/if}
8484
<tr class="{$report_row_class}">
8585
<td class="cellLeftAligned">{$item.date}</td>
86-
{if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
86+
{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
8787
{if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
8888
{if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
8989
{if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
@@ -92,7 +92,7 @@
9292
{if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
9393
{if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
9494
{if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}
95-
{if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
95+
{if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->can('manage_invoices') || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
9696
{if $bean->getAttribute('chpaid')}<td class="cellRightAligned">{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
9797
{if $bean->getAttribute('chip')}<td class="cellRightAligned">{if $item.modified}{$item.modified_ip} {$item.modified}{else}{$item.created_ip} {$item.created}{/if}{/if}
9898
{if $bean->getAttribute('chinvoice')}<td class="cellRightAligned">{$item.invoice|escape}</td>{/if}
@@ -108,7 +108,7 @@
108108
{if $print_subtotals}
109109
<tr class="rowReportSubtotal">
110110
<td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
111-
{if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
111+
{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
112112
{if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
113113
{if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
114114
{if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
@@ -117,7 +117,7 @@
117117
{if $bean->getAttribute('chfinish')}<td></td>{/if}
118118
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
119119
{if $bean->getAttribute('chnote')}<td></td>{/if}
120-
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
120+
{if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if}</td>{/if}
121121
{if $bean->getAttribute('chpaid')}<td></td>{/if}
122122
{if $bean->getAttribute('chip')}<td></td>{/if}
123123
{if $bean->getAttribute('chinvoice')}<td></td>{/if}
@@ -128,7 +128,7 @@
128128
<tr><td>&nbsp;</td></tr>
129129
<tr class="rowReportSubtotal">
130130
<td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
131-
{if $user->canManageTeam() || $user->isClient()}<td></td>{/if}
131+
{if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}<td></td>{/if}
132132
{if $bean->getAttribute('chclient')}<td></td>{/if}
133133
{if $bean->getAttribute('chproject')}<td></td>{/if}
134134
{if $bean->getAttribute('chtask')}<td></td>{/if}
@@ -137,7 +137,7 @@
137137
{if $bean->getAttribute('chfinish')}<td></td>{/if}
138138
{if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
139139
{if $bean->getAttribute('chnote')}<td></td>{/if}
140-
{if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
140+
{if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
141141
{if $bean->getAttribute('chpaid')}<td></td>{/if}
142142
{if $bean->getAttribute('chip')}<td></td>{/if}
143143
{if $bean->getAttribute('chinvoice')}<td></td>{/if}

0 commit comments

Comments
 (0)