X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time.php;h=e7ff10ae8f8eb3f9ffba59123a5a25bb0a3af1b3;hb=a26a0989ad93cce9de9f45312990da9610e53045;hp=7b6376c8ec0db3413464548cc2852da5bd444cc0;hpb=5c582eb5bacc8b3d9d2775ade454590c71b113ec;p=timetracker.git diff --git a/time.php b/time.php index 7b6376c8..e7ff10ae 100644 --- a/time.php +++ b/time.php @@ -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->getConfigOption('menu_week')); $smarty->assign('show_client', $showClient); $smarty->assign('show_cf_1', $user->isPluginEnabled('cf')); $smarty->assign('show_project', $showProject);