require_once('initialize.php');
import('form.Form');
import('ttTeamHelper');
+import('ttGroupHelper');
import('ttUserHelper');
import('form.Table');
import('form.TableColumn');
// 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.
+// The "limit" plugin is not required for normal operation of Time Tracker.
@include('plugins/limit/user_add.php');
+$show_quota = $user->isPluginEnabled('mq');
if ($user->isPluginEnabled('cl'))
- $clients = ttTeamHelper::getActiveClients($user->getGroup());
+ $clients = ttGroupHelper::getActiveClients();
$assigned_projects = array();
if ($request->isPost()) {
$cl_role_id = $request->getParameter('role');
$cl_client_id = $request->getParameter('client');
$cl_rate = $request->getParameter('rate');
+ $cl_quota_percent = $request->getParameter('quota_percent');
$cl_projects = $request->getParameter('projects');
if (is_array($cl_projects)) {
foreach ($cl_projects as $p) {
$form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
$form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
+if ($show_quota)
+ $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));
-$projects = ttTeamHelper::getActiveProjects($user->getGroup());
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+ $projects = ttGroupHelper::getActiveProjects();
+ if (count($projects) == 0) $show_projects = false;
+}
// Define classes for the projects table.
class NameCellRenderer extends DefaultCellRenderer {
// Create projects table.
$table = new Table('projects');
$table->setIAScript('setDefaultRate');
-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
$table->setData($projects);
$table->setKeyField('id');
// Require selection of a client for a client role.
if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
+ if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+ if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
if ($err->no()) {
if (!ttUserHelper::getUserByLogin($cl_login)) {
'login' => $cl_login,
'password' => $cl_password1,
'rate' => $cl_rate,
+ 'quota_percent' => $cl_quota_percent,
'group_id' => $user->getGroup(),
'org_id' => $user->org_id,
'role_id' => $cl_role_id,
'client_id' => $cl_client_id,
'projects' => $assigned_projects,
'email' => $cl_email);
- if (ttUserHelper::insert($fields)) {
+ $user_id = ttUserHelper::insert($fields);
+ if ($user_id) {
+ if (!$user->exists()) {
+ // We added a user to an empty subgroup. Set new user as on behalf user.
+ // Needed for user-based things to work (such as notifications config).
+ $user->setOnBehalfUser($user_id);
+ }
header('Location: users.php');
exit();
} else
$smarty->assign('active_roles', $active_roles);
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
$smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
$smarty->assign('title', $i18n->get('title.add_user'));
$smarty->assign('content_page_name', 'user_add.tpl');
$smarty->display('index.tpl');