X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=week.php;h=edba8996e941f0842041fdee7ede69d970accf93;hb=f9e5e8956921839e6742a85db2067ddc6ef5b2b8;hp=927e8a776508636873ec1dc7d11bd6f1f6abb2f6;hpb=fa6508ac21c30d6bfef008387fabd29a843d7b66;p=timetracker.git diff --git a/week.php b/week.php index 927e8a77..edba8996 100644 --- a/week.php +++ b/week.php @@ -32,7 +32,7 @@ import('form.DefaultCellRenderer'); import('form.Table'); import('form.TextField'); import('ttUserHelper'); -import('ttTeamHelper'); +import('ttGroupHelper'); import('ttWeekViewHelper'); import('ttClientHelper'); import('ttTimeHelper'); @@ -83,7 +83,7 @@ $endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeek // Use custom fields plugin if it is enabled. if ($user->isPluginEnabled('cf')) { require_once('plugins/CustomFields.class.php'); - $custom_fields = new CustomFields($user->group_id); + $custom_fields = new CustomFields(); $smarty->assign('custom_fields', $custom_fields); } @@ -244,7 +244,7 @@ $form->addInputElement($table); // Dropdown for clients in MODE_TIME. Use all active clients. if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->group_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); $form->addInput(array('type'=>'combobox', 'onchange'=>'fillProjectDropdown(this.value);', 'name'=>'client', @@ -270,7 +270,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t // Dropdown for clients if the clients plugin is enabled. if ($user->isPluginEnabled('cl')) { - $active_clients = ttTeamHelper::getActiveClients($user->group_id, true); + $active_clients = ttGroupHelper::getActiveClients(true); // We need an array of assigned project ids to do some trimming. foreach($project_list as $project) $projects_assigned_to_user[] = $project['id']; @@ -298,7 +298,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t } if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { - $task_list = ttTeamHelper::getActiveTasks($user->group_id); + $task_list = ttGroupHelper::getActiveTasks(); $form->addInput(array('type'=>'combobox', 'name'=>'task', 'style'=>'width: 250px;',