projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ttOrgImportHelper class impoved to output conflicting login names.
[timetracker.git]
/
user_add.php
diff --git
a/user_add.php
b/user_add.php
index
b235cbd
..
eb93914
100644
(file)
--- a/
user_add.php
+++ b/
user_add.php
@@
-46,7
+46,7
@@
if (!ttAccessAllowed('manage_users')) {
@include('plugins/limit/user_add.php');
if ($user->isPluginEnabled('cl'))
@include('plugins/limit/user_add.php');
if ($user->isPluginEnabled('cl'))
- $clients = ttTeamHelper::getActiveClients($user->
team
_id);
+ $clients = ttTeamHelper::getActiveClients($user->
group
_id);
$assigned_projects = array();
if ($request->isPost()) {
$assigned_projects = array();
if ($request->isPost()) {
@@
-90,7
+90,7
@@
if ($user->isPluginEnabled('cl'))
$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
-$projects = ttTeamHelper::getActiveProjects($user->
team
_id);
+$projects = ttTeamHelper::getActiveProjects($user->
group
_id);
// Define classes for the projects table.
class NameCellRenderer extends DefaultCellRenderer {
// Define classes for the projects table.
class NameCellRenderer extends DefaultCellRenderer {
@@
-150,7
+150,8
@@
if ($request->isPost()) {
'login' => $cl_login,
'password' => $cl_password1,
'rate' => $cl_rate,
'login' => $cl_login,
'password' => $cl_password1,
'rate' => $cl_rate,
- 'team_id' => $user->team_id,
+ 'group_id' => $user->getActiveGroup(),
+ 'org_id' => $user->org_id,
'role_id' => $cl_role_id,
'client_id' => $cl_client_id,
'projects' => $assigned_projects,
'role_id' => $cl_role_id,
'client_id' => $cl_client_id,
'projects' => $assigned_projects,