X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time.php;h=2dc8606d02f98316516fca3221b0ee369b1ee4cf;hb=691958794018beda9788e9bdb47d640a116af492;hp=f6c84759f8886f2e40c32d568baf4a2b70a7e294;hpb=920b5bff2bf2fb1caa10715ed8d40175e4798019;p=timetracker.git diff --git a/time.php b/time.php index f6c84759..2dc8606d 100644 --- a/time.php +++ b/time.php @@ -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']); @@ -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);