projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor improvement in the German translation.
[timetracker.git]
/
mobile
/
time_delete.php
diff --git
a/mobile/time_delete.php
b/mobile/time_delete.php
index
1683302
..
c9602b4
100644
(file)
--- a/
mobile/time_delete.php
+++ b/
mobile/time_delete.php
@@
-38,12
+38,6
@@
if (!ttAccessCheck(right_data_entry)) {
exit();
}
exit();
}
-// Use Custom Fields plugin if we have one.
-// if (file_exists("plugins/CustomFields.class.php")) {
-// require_once("plugins/CustomFields.class.php");
-// $custom_fields = new CustomFields($user->team_id);
-// }
-
$cl_id = $request->getParameter('id');
$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
$cl_id = $request->getParameter('id');
$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
@@
-59,21
+53,13
@@
if ($request->isPost()) {
// Determine if it's okay to delete the record.
$item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
// Determine if it's okay to delete the record.
$item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
- // Determine lock date.
- $lock_interval = $user->lock_interval;
- $lockdate = 0;
- if ($lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($lock_interval);
- }
// Determine if the record is uncompleted.
$uncompleted = ($time_rec['duration'] == '0:00');
// Determine if the record is uncompleted.
$uncompleted = ($time_rec['duration'] == '0:00');
- if($lockdate && $item_date->before($lockdate) && !$uncompleted) {
- $errors->add($i18n->getKey('error.period_locked'));
- }
+ if ($user->isDateLocked($item_date) && !$uncompleted)
+ $err->add($i18n->getKey('error.range_locked'));
- if ($err
ors
->no()) {
+ if ($err->no()) {
// Delete the record.
$result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
// Delete the record.
$result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
@@
-82,7
+68,7
@@
if ($request->isPost()) {
header('Location: time.php');
exit();
} else {
header('Location: time.php');
exit();
} else {
- $err
ors
->add($i18n->getKey('error.db'));
+ $err->add($i18n->getKey('error.db'));
}
}
}
}
}
}
@@
-90,7
+76,7
@@
if ($request->isPost()) {
header('Location: time.php');
exit();
}
header('Location: time.php');
exit();
}
-} //
POST
+} //
isPost
$form = new Form('timeRecordForm');
$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
$form = new Form('timeRecordForm');
$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));