X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_edit.php;h=8a4e421b16fa9c34c3d5757fe4c45668e657ff85;hb=1e7092b2a85592240048d9622a6f619aa2a7c68a;hp=f370f451d1fec415078d7f4395f48b15c3dc8eb8;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git diff --git a/user_edit.php b/user_edit.php index f370f451..8a4e421b 100644 --- a/user_edit.php +++ b/user_edit.php @@ -41,7 +41,7 @@ if (!ttAccessAllowed('manage_users')) { exit(); } $user_id = (int)$request->getParameter('id'); -$user_details = $user->getUser($user_id); +$user_details = $user->getUserDetails($user_id); if (!$user_details) { header('Location: access_denied.php'); exit(); @@ -49,9 +49,9 @@ if (!$user_details) { // End of access checks. if ($user->isPluginEnabled('cl')) - $clients = ttTeamHelper::getActiveClients($user->group_id); + $clients = ttTeamHelper::getActiveClients($user->getGroup()); -$projects = ttTeamHelper::getActiveProjects($user->group_id); +$projects = ttTeamHelper::getActiveProjects($user->getGroup()); $assigned_projects = array(); if ($request->isPost()) { @@ -82,7 +82,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 +227,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);