projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed export and import for locking specification.
[timetracker.git]
/
expense_edit.php
diff --git
a/expense_edit.php
b/expense_edit.php
index
abd5c39
..
2a99654
100644
(file)
--- a/
expense_edit.php
+++ b/
expense_edit.php
@@
-68,7
+68,7
@@
if ($request->isPost()) {
$form = new Form('expenseItemForm');
// Dropdown for clients in MODE_TIME. Use all active clients.
$form = new Form('expenseItemForm');
// Dropdown for clients in MODE_TIME. Use all active clients.
-if (MODE_TIME == $user->tracking_mode &&
in_array('cl', explode(',', $user->plugins)
)) {
+if (MODE_TIME == $user->tracking_mode &&
$user->isPluginEnabled('cl'
)) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
@@
-93,7
+93,7
@@
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Dropdown for clients if the clients plugin is enabled.
'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Dropdown for clients if the clients plugin is enabled.
- if (
in_array('cl', explode(',', $user->plugins)
)) {
+ if (
$user->isPluginEnabled('cl'
)) {
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
$active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
@@
-131,7
+131,7
@@
$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getK
if ($request->isPost()) {
// Validate user input.
if ($request->isPost()) {
// Validate user input.
- if (
in_array('cl', explode(',', $user->plugins)) && in_array('cm', explode(',', $user->plugins)
) && !$cl_client)
+ if (
$user->isPluginEnabled('cl') && $user->isPluginEnabled('cm'
) && !$cl_client)
$err->add($i18n->getKey('error.client'));
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
if (!$cl_project) $err->add($i18n->getKey('error.project'));
$err->add($i18n->getKey('error.client'));
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
if (!$cl_project) $err->add($i18n->getKey('error.project'));
@@
-140,14
+140,6
@@
if ($request->isPost()) {
if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
if (!ttValidFloat($cl_cost)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cost'));
if (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));
- // Determine lock date.
- $lock_interval = $user->lock_interval;
- $lockdate = 0;
- if ($lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($lock_interval);
- }
-
// This is a new date for the expense item.
$new_date = new DateAndTime($user->date_format, $cl_date);
// This is a new date for the expense item.
$new_date = new DateAndTime($user->date_format, $cl_date);
@@
-161,15
+153,16
@@
if ($request->isPost()) {
// Save record.
if ($request->getParameter('btn_save')) {
// We need to:
// Save record.
if ($request->getParameter('btn_save')) {
// We need to:
- // 1) Prohibit updating locked entries (that are in locked
interval
).
- // 2) Prohibit saving unlocked entries into locked
interval
.
+ // 1) Prohibit updating locked entries (that are in locked
range
).
+ // 2) Prohibit saving unlocked entries into locked
range
.
// Now, step by step.
// Now, step by step.
- // 1) Prohibit
updating locked entries
.
- if
($lockdate && $item_date->before($lock
date))
+ // 1) Prohibit
saving locked entries in any form
.
+ if
($user->isDateLocked($item_
date))
$err->add($i18n->getKey('error.period_locked'));
$err->add($i18n->getKey('error.period_locked'));
- // 2) Prohibit saving completed unlocked entries into locked interval.
- if($err->no() && $lockdate && $new_date->before($lockdate))
+
+ // 2) Prohibit saving unlocked entries into locked range.
+ if ($err->no() && $user->isDateLocked($new_date))
$err->add($i18n->getKey('error.period_locked'));
// Now, an update.
$err->add($i18n->getKey('error.period_locked'));
// Now, an update.
@@
-185,7
+178,7
@@
if ($request->isPost()) {
// Save as new record.
if ($request->getParameter('btn_copy')) {
// We need to prohibit saving into locked interval.
// Save as new record.
if ($request->getParameter('btn_copy')) {
// We need to prohibit saving into locked interval.
- if
($lockdate && $new_date->before($lock
date))
+ if
($user->isDateLocked($new_
date))
$err->add($i18n->getKey('error.period_locked'));
// Now, a new insert.
$err->add($i18n->getKey('error.period_locked'));
// Now, a new insert.