import('ttUserHelper');
import('form.Table');
import('form.TableColumn');
+import('ttRoleHelper');
// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_users')) {
header('Location: access_denied.php');
exit();
}
}
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
-$roles[ROLE_USER] = $i18n->getKey('label.user');
-$roles[ROLE_COMANAGER] = $i18n->getKey('form.users.comanager');
-if ($user->isPluginEnabled('cl'))
- $roles[ROLE_CLIENT] = $i18n->getKey('label.client');
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role,'data'=>$roles));
+$active_roles = ttTeamHelper::getActiveRolesForUser();
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
if ($user->isPluginEnabled('cl'))
$form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
// Define classes for the projects table.
class NameCellRenderer extends DefaultCellRenderer {
function render(&$table, $value, $row, $column, $selected = false) {
- $this->setOptions(array('width'=>200,'valign'=>'top'));
+ $this->setOptions(array('width'=>200));
$this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
return $this->toString();
}
global $assigned_projects;
$field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));
$field->setFormName($table->getFormName());
- $field->localize($GLOBALS['I18N']);
$field->setSize(5);
$field->setFormat('.2');
foreach ($assigned_projects as $p) {
$err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
}
if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+ // Require selection of a client for a client role.
+ if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role) && !$cl_client_id) $err->add($i18n->getKey('error.client'));
if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
if ($err->no()) {
if (!ttUserHelper::getUserByLogin($cl_login)) {
+ // Get legacy role value.
+ $legacy_role = ttRoleHelper::getLegacyRole($cl_role); // TODO: remove after roles revamp.
$fields = array(
'name' => $cl_name,
'login' => $cl_login,
'password' => $cl_password1,
'rate' => $cl_rate,
'team_id' => $user->team_id,
- 'role' => $cl_role,
+ 'role' => $legacy_role,
+ 'role_id' => $cl_role,
'client_id' => $cl_client_id,
'projects' => $assigned_projects,
'email' => $cl_email);
} // isPost
$smarty->assign('auth_external', $auth->isPasswordExternal());
+$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('title', $i18n->getKey('title.add_user'));