A bit of refactoring.

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index e7ff10ae8f8eb3f9ffba59123a5a25bb0a3af1b3..2dc8606d02f98316516fca3221b0ee369b1ee4cf 100644 (file)
--- a/time.php
+++ b/time.php
@@ -306,7 +306,7 @@ if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
 
     // Validate user input.
   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']);
       $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']);


@@ -448,7 +448,7 @@ $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('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_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);
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_cf_1', $user->isPluginEnabled('cf'));
 $smarty->assign('show_project', $showProject);