X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_edit.php;h=531d2efecaa897574be048e1ff04bd4d20c212ae;hb=7b271fc399126b3dc32aadb30cb839241668cead;hp=8f588db97594d19c98305e72bec90bba7b4890f6;hpb=bdbf162130c02c6a5510205c7704ef7d5e8f22ea;p=timetracker.git diff --git a/user_edit.php b/user_edit.php index 8f588db9..531d2efe 100644 --- a/user_edit.php +++ b/user_edit.php @@ -30,6 +30,7 @@ require_once('initialize.php'); import('form.Form'); import('ttProjectHelper'); import('ttTeamHelper'); +import('ttGroupHelper'); import('ttUserHelper'); import('form.Table'); import('form.TableColumn'); @@ -40,8 +41,8 @@ if (!ttAccessAllowed('manage_users')) { header('Location: access_denied.php'); exit(); } -$user_id = (int) $request->getParameter('id'); -$user_details = $user->getUser($user_id); +$user_id = (int)$request->getParameter('id'); +$user_details = $user->getUserDetails($user_id); if (!$user_details) { header('Location: access_denied.php'); exit(); @@ -49,9 +50,9 @@ if (!$user_details) { // End of access checks. if ($user->isPluginEnabled('cl')) - $clients = ttTeamHelper::getActiveClients($user->team_id); + $clients = ttGroupHelper::getActiveClients(); -$projects = ttTeamHelper::getActiveProjects($user->team_id); +$projects = ttGroupHelper::getActiveProjects(); $assigned_projects = array(); if ($request->isPost()) { @@ -82,7 +83,7 @@ if ($request->isPost()) { $cl_name = $user_details['name']; $cl_login = $user_details['login']; $cl_email = $user_details['email']; - $cl_rate = str_replace('.', $user->decimal_mark, $user_details['rate']); + $cl_rate = str_replace('.', $user->getDecimalMark(), $user_details['rate']); $cl_role_id = $user_details['role_id']; $cl_client_id = $user_details['client_id']; $cl_status = $user_details['status']; @@ -227,6 +228,7 @@ $smarty->assign('rates', $rates); $smarty->assign('auth_external', $auth->isPasswordExternal()); $smarty->assign('active_roles', $active_roles); $smarty->assign('can_swap', $can_swap); +$smarty->assign('show_projects', count($projects) > 0); $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"'); $smarty->assign('user_id', $user_id);