Improved clients.php to support subgroups.

[timetracker.git] / user_edit.php

diff --git a/user_edit.php b/user_edit.php
index 95ed29e..df3ada4 100644 (file)
--- 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');
@@ -41,7 +42,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 +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 = ttTeamHelper::getActiveProjects($user->getGroup());
 $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);