projects
/
timetracker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b859fc8
)
Some more refactoring.
author
Nik Okuntseff
<support@anuko.com>
Wed, 14 Mar 2018 16:07:50 +0000
(16:07 +0000)
committer
Nik Okuntseff
<support@anuko.com>
Wed, 14 Mar 2018 16:07:50 +0000
(16:07 +0000)
12 files changed:
WEB-INF/lib/ttTeamHelper.class.php
patch
|
blob
|
history
WEB-INF/lib/ttTimeHelper.class.php
patch
|
blob
|
history
WEB-INF/templates/cf_custom_field_add.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_custom_field_delete.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_custom_field_edit.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_custom_fields.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_dropdown_option_add.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_dropdown_option_delete.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_dropdown_option_edit.tpl
patch
|
blob
|
history
WEB-INF/templates/cf_dropdown_options.tpl
patch
|
blob
|
history
WEB-INF/templates/expense_edit.tpl
patch
|
blob
|
history
WEB-INF/templates/footer.tpl
patch
|
blob
|
history
diff --git
a/WEB-INF/lib/ttTeamHelper.class.php
b/WEB-INF/lib/ttTeamHelper.class.php
index
38a2d81
..
684fa63
100644
(file)
--- a/
WEB-INF/lib/ttTeamHelper.class.php
+++ b/
WEB-INF/lib/ttTeamHelper.class.php
@@
-1054,7
+1054,7
@@
class ttTeamHelper {
static function enablePlugin($plugin, $enable = true)
{
global $user;
static function enablePlugin($plugin, $enable = true)
{
global $user;
- if (!$user->can
ManageTeam(
))
+ if (!$user->can
('manage_features'
))
return false;
$plugin_array = explode(',', $user->plugins);
return false;
$plugin_array = explode(',', $user->plugins);
diff --git
a/WEB-INF/lib/ttTimeHelper.class.php
b/WEB-INF/lib/ttTimeHelper.class.php
index
7cbf4dd
..
222bcca
100644
(file)
--- a/
WEB-INF/lib/ttTimeHelper.class.php
+++ b/
WEB-INF/lib/ttTimeHelper.class.php
@@
-474,7
+474,7
@@
class ttTimeHelper {
$billable_part = $fields['billable'] ? ', billable = 1' : ', billable = 0';
}
$paid_part = '';
$billable_part = $fields['billable'] ? ', billable = 1' : ', billable = 0';
}
$paid_part = '';
- if ($user->can
ManageTeam(
) && $user->isPluginEnabled('ps')) {
+ if ($user->can
('manage_invoices'
) && $user->isPluginEnabled('ps')) {
$paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
}
$paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0';
}
diff --git
a/WEB-INF/templates/cf_custom_field_add.tpl
b/WEB-INF/templates/cf_custom_field_add.tpl
index
04908bb
..
442f41b
100644
(file)
--- a/
WEB-INF/templates/cf_custom_field_add.tpl
+++ b/
WEB-INF/templates/cf_custom_field_add.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
diff --git
a/WEB-INF/templates/cf_custom_field_delete.tpl
b/WEB-INF/templates/cf_custom_field_delete.tpl
index
00ad37f
..
fae6d80
100644
(file)
--- a/
WEB-INF/templates/cf_custom_field_delete.tpl
+++ b/
WEB-INF/templates/cf_custom_field_delete.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td colspan="2" align="center"><b>{$field|escape}</b></td>
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td colspan="2" align="center"><b>{$field|escape}</b></td>
diff --git
a/WEB-INF/templates/cf_custom_field_edit.tpl
b/WEB-INF/templates/cf_custom_field_edit.tpl
index
5e4d57c
..
beabbe7
100644
(file)
--- a/
WEB-INF/templates/cf_custom_field_edit.tpl
+++ b/
WEB-INF/templates/cf_custom_field_edit.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
diff --git
a/WEB-INF/templates/cf_custom_fields.tpl
b/WEB-INF/templates/cf_custom_fields.tpl
index
51e8376
..
7a1b156
100644
(file)
--- a/
WEB-INF/templates/cf_custom_fields.tpl
+++ b/
WEB-INF/templates/cf_custom_fields.tpl
@@
-2,7
+2,7
@@
<table cellspacing="0" cellpadding="7" border="0" width="720">
<tr>
<td valign="top">
<table cellspacing="0" cellpadding="7" border="0" width="720">
<tr>
<td valign="top">
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="3" border="0" width="100%">
<tr>
<td width="50%" class="tableHeader">{$i18n.label.thing_name}</td>
<table cellspacing="1" cellpadding="3" border="0" width="100%">
<tr>
<td width="50%" class="tableHeader">{$i18n.label.thing_name}</td>
diff --git
a/WEB-INF/templates/cf_dropdown_option_add.tpl
b/WEB-INF/templates/cf_dropdown_option_add.tpl
index
5d892d1
..
bcc1cee
100644
(file)
--- a/
WEB-INF/templates/cf_dropdown_option_add.tpl
+++ b/
WEB-INF/templates/cf_dropdown_option_add.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
diff --git
a/WEB-INF/templates/cf_dropdown_option_delete.tpl
b/WEB-INF/templates/cf_dropdown_option_delete.tpl
index
6a273db
..
bec03cc
100644
(file)
--- a/
WEB-INF/templates/cf_dropdown_option_delete.tpl
+++ b/
WEB-INF/templates/cf_dropdown_option_delete.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td colspan="2" align="center"><b>{$option|escape}</b></td>
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td colspan="2" align="center"><b>{$option|escape}</b></td>
diff --git
a/WEB-INF/templates/cf_dropdown_option_edit.tpl
b/WEB-INF/templates/cf_dropdown_option_edit.tpl
index
84deaa2
..
c2b0bae
100644
(file)
--- a/
WEB-INF/templates/cf_dropdown_option_edit.tpl
+++ b/
WEB-INF/templates/cf_dropdown_option_edit.tpl
@@
-2,7
+2,7
@@
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
<table cellspacing="4" cellpadding="7" border="0">
<tr>
<td>
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
<table cellspacing="1" cellpadding="2" border="0">
<tr>
<td align="right">{$i18n.label.thing_name} (*):</td>
diff --git
a/WEB-INF/templates/cf_dropdown_options.tpl
b/WEB-INF/templates/cf_dropdown_options.tpl
index
2882d92
..
ba15a41
100644
(file)
--- a/
WEB-INF/templates/cf_dropdown_options.tpl
+++ b/
WEB-INF/templates/cf_dropdown_options.tpl
@@
-6,7
+6,7
@@
<table cellspacing="0" cellpadding="7" border="0" width="720">
<tr>
<td valign="top">
<table cellspacing="0" cellpadding="7" border="0" width="720">
<tr>
<td valign="top">
-{if $user->can
ManageTeam(
)}
+{if $user->can
('manage_custom_fields'
)}
<table cellspacing="1" cellpadding="3" border="0" width="100%">
<tr>
<td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
<table cellspacing="1" cellpadding="3" border="0" width="100%">
<tr>
<td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
diff --git
a/WEB-INF/templates/expense_edit.tpl
b/WEB-INF/templates/expense_edit.tpl
index
39198b8
..
953f78d
100644
(file)
--- a/
WEB-INF/templates/expense_edit.tpl
+++ b/
WEB-INF/templates/expense_edit.tpl
@@
-150,7
+150,7
@@
function recalculateCost() {
<td align="right">{$i18n.label.cost}:</td>
<td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>
</tr>
<td align="right">{$i18n.label.cost}:</td>
<td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>
</tr>
-{if ($user->can
ManageTeam(
) && $user->isPluginEnabled('ps'))}
+{if ($user->can
('manage_invoices'
) && $user->isPluginEnabled('ps'))}
<tr>
<td align="right"> </td>
<td><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
<tr>
<td align="right"> </td>
<td><label>{$forms.expenseItemForm.paid.control}{$i18n.label.paid}</label></td>
diff --git
a/WEB-INF/templates/footer.tpl
b/WEB-INF/templates/footer.tpl
index
f7e7f6b
..
3807ef1
100644
(file)
--- a/
WEB-INF/templates/footer.tpl
+++ b/
WEB-INF/templates/footer.tpl
@@
-12,7
+12,7
@@
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
<br>
<table cellspacing="0" cellpadding="4" width="100%" border="0">
<tr>
- <td align="center"> Anuko Time Tracker 1.17.43.407
5
| Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+ <td align="center"> Anuko Time Tracker 1.17.43.407
6
| Copyright © <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>