X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_add.php;h=8a507e9ee42e99da9cdf0a4112539afc78fada28;hb=45a530c33fdd7ab2ccd1905c24a371c94e17eac5;hp=91286537d534e2191c7eb27d0df03c174272705b;hpb=fd0872d9e582113346fa1e93557f370286c5c9f2;p=timetracker.git

diff --git a/user_add.php b/user_add.php
index 91286537..8a507e9e 100644
--- a/user_add.php
+++ b/user_add.php
@@ -29,23 +29,25 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
 import('ttRoleHelper');
 
-// Access check.
+// Access checks.
 if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
+// End of access checks.
 
 // Use the "limit" plugin if we have one. Ignore include errors.
 // The "limit" plugin is not required for normal operation of the Time Tracker.
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+  $clients = ttGroupHelper::getActiveClients();
 
 $assigned_projects = array();
 if ($request->isPost()) {
@@ -89,7 +91,7 @@ if ($user->isPluginEnabled('cl'))
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
@@ -149,7 +151,8 @@ if ($request->isPost()) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
-        'team_id' => $user->team_id,
+        'group_id' => $user->getGroup(),
+        'org_id' => $user->org_id,
         'role_id' => $cl_role_id,
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
@@ -167,6 +170,7 @@ if ($request->isPost()) {
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('active_roles', $active_roles);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', count($projects) > 0);
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('title', $i18n->get('title.add_user'));
 $smarty->assign('content_page_name', 'user_add.tpl');