X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_edit.php;h=854c4463771a6dd1f65eb76e715e0ccc4add85e5;hb=e84f77ca5b0a5470425cac47aa90563508793699;hp=82875978c632434a460c7bbdfed059105e0b2d4e;hpb=55c8f6a2bce9518c28337b18823b8300d1875ab8;p=timetracker.git

diff --git a/time_edit.php b/time_edit.php
index 82875978..854c4463 100644
--- a/time_edit.php
+++ b/time_edit.php
@@ -95,7 +95,7 @@ if ($request->isPost()) {
   $cl_billable = $time_rec['billable'];
 
   // Add an info message to the form if we are editing an uncompleted record.
-  if (($cl_start == $cl_finish) && ($cl_duration == '0:00')) {
+  if (strlen($cl_start) > 0 && $cl_start == $cl_finish && $cl_duration == '0:00') {
     $cl_finish = '';
     $cl_duration = '';
     $msg->add($i18n->getKey('form.time_edit.uncompleted'));
@@ -175,11 +175,11 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
 if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
   $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');"));
   $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');"));
-}
-if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
-  // Make the start and finish fields read-only.
-  $form->getElement('start')->setEnable(false);
-  $form->getElement('finish')->setEnable(false);
+  if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) {
+    // Make the start and finish fields read-only.
+    $form->getElement('start')->setEnabled(false);
+    $form->getElement('finish')->setEnabled(false);
+  }
 }
 if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type))
   $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');"));
@@ -202,7 +202,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
 // Hidden control for record id.
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 if ($user->isPluginEnabled('iv'))
-  $form->addInput(array('type'=>'checkbox','name'=>'billable','data'=>1,'value'=>$cl_billable));
+  $form->addInput(array('type'=>'checkbox','name'=>'billable','value'=>$cl_billable));
 $form->addInput(array('type'=>'hidden','name'=>'browser_today','value'=>'')); // User current date, which gets filled in on btn_save or btn_copy click.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','onclick'=>'browser_today.value=get_date()','value'=>$i18n->getKey('button.copy')));
@@ -219,7 +219,7 @@ 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 (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) {
     if (!$cl_task) $err->add($i18n->getKey('error.task'));
   }
   if (!$cl_duration) {
@@ -271,11 +271,11 @@ if ($request->isPost()) {
     if ($err->no()) {
       // 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.range_locked'));
 
       // 2) Prohibit saving completed unlocked entries into locked range.
       if ($err->no() && $user->isDateLocked($new_date))
-        $err->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.range_locked'));
 
       // 3) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');
@@ -334,7 +334,7 @@ if ($request->isPost()) {
     if ($err->no()) {
       // 1) Prohibit saving into locked range.
       if ($user->isDateLocked($new_date))
-        $err->add($i18n->getKey('error.period_locked'));
+        $err->add($i18n->getKey('error.range_locked'));
 
       // 2) Prohibit saving uncompleted unlocked entries when another uncompleted entry exists.
       $uncompleted = ($cl_finish == '' && $cl_duration == '');