posaune

[timetracker.git] / week.php

diff --git a/week.php b/week.php
index a77e987f8b69b9b57f6c2f36b2938d4a8c11a4e5..9af3564414f5d4e86efaccad1f6416f1b8cad5c3 100644 (file)
--- a/week.php
+++ b/week.php
@@ -338,7 +338,7 @@ if ($custom_fields && $custom_fields->fields[0]) {
     $form->addInput(array('type'=>'combobox','name'=>'cf_1',
       'style'=>'width: 250px;',
       'value'=>$cl_cf_1,
     $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'))));
   }
 }
       'empty'=>array(''=>$i18n->get('dropdown.select'))));
   }
 }


@@ -517,7 +517,7 @@ $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);
 $smarty->assign('onload', 'onLoad="fillDropdowns()"');
 $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format));
 $smarty->assign('time_records', $records);

-$smarty->assign('show_navigation', !$user->getConfigOption('menu_week'));
+$smarty->assign('show_navigation', !$user->isOptionEnabled('week_menu'));

 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);
 $smarty->assign('show_client', $showClient);
 $smarty->assign('show_project', $showProject);
 $smarty->assign('show_task', $showTask);