posaune

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index 7b6376c..f058a21 100644 (file)
--- a/time.php
+++ b/time.php
@@ -280,7 +280,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
-      'data'=>$custom_fields->options,
+      'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }
@@ -306,7 +306,7 @@ if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
-    if ($showClient && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($showClient && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($custom_fields) {
       if (!ttValidString($cl_cf_1, !$custom_fields->fields[0]['required'])) $err->add($i18n->get('error.field'), $custom_fields->fields[0]['label']);
@@ -395,7 +395,7 @@ if ($request->isPost()) {
       }
 
       // Put a new file in storage if we have it.
-      if ($showFiles && $_FILES['newfile']['name']) {
+      if ($id && $showFiles && $_FILES['newfile']['name']) {
         $fileHelper = new ttFileHelper($err);
         $fields = array('entity_type'=>'time',
           'entity_id' => $id,
@@ -442,12 +442,13 @@ if ($request->isPost()) {
 } // isPost
 
 $week_total = ttTimeHelper::getTimeForWeek($selected_date);
-$timeRecords = $showFiles? ttTimeHelper::getRecordsWithFiles($user_id, $cl_date) : ttTimeHelper::getRecords($user_id, $cl_date);
+$timeRecords = ttTimeHelper::getRecords($cl_date, $showFiles);
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date));
 $smarty->assign('time_records', $timeRecords);
+$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->isOptionEnabled('week_menu'));
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);