From: anuko Date: Tue, 17 Jan 2017 21:18:26 +0000 (+0000) Subject: Allowed null tasks in project and tasks tracking mode. X-Git-Tag: timetracker_1.19-1~1604 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b0e8ffd3af439b5dc6dd5044a46a906d9833932b;p=timetracker.git Allowed null tasks in project and tasks tracking mode. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index d4602ab4..a3a82452 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - + {/if} diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl index c6431d90..fd3c1730 100644 --- a/WEB-INF/templates/time_edit.tpl +++ b/WEB-INF/templates/time_edit.tpl @@ -230,7 +230,7 @@ function setNow(formField) { {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} diff --git a/mobile/time.php b/mobile/time.php index 2dfe239c..b0c5de11 100644 --- a/mobile/time.php +++ b/mobile/time.php @@ -196,9 +196,6 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); - } if (strlen($cl_duration) == 0) { if ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) diff --git a/mobile/time_edit.php b/mobile/time_edit.php index a99835af..9e1fc324 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -218,9 +218,6 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); - } if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); diff --git a/time.php b/time.php index 47e06a14..d8889110 100644 --- a/time.php +++ b/time.php @@ -231,9 +231,6 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); - } if (strlen($cl_duration) == 0) { if ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) diff --git a/time_edit.php b/time_edit.php index d486d652..aa204198 100644 --- a/time_edit.php +++ b/time_edit.php @@ -219,9 +219,6 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } - if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - if (!$cl_task) $err->add($i18n->getKey('error.task')); - } if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration'));
 Anuko Time Tracker 1.9.34.3550 | Copyright © Anuko | +  Anuko Time Tracker 1.9.35.3551 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index ee17d9d4..0afaa15b 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -248,7 +248,7 @@ function get_time() { {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
{$i18n.label.task} (*):{$i18n.label.task}: {$forms.timeRecordForm.task.control}
{$i18n.label.task} (*):{$i18n.label.task}: {$forms.timeRecordForm.task.control}