X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=user_edit.php;h=8308892423c0c042d79f60d32330bfc06762e70a;hb=ad98b13400fdc2fa2299a22c9bd54c4cd27960c3;hp=0dc7afb3087a97c768d7b5da2d74061671d30611;hpb=2a998c95dd9e86a9ad57939b056b62cab7402b08;p=timetracker.git
diff --git a/user_edit.php b/user_edit.php
index 0dc7afb3..83088924 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -107,8 +107,8 @@ $form = new Form('userForm');
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
if (!$auth->isPasswordExternal()) {
- $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'pas1','aspassword'=>true,'value'=>$cl_password1));
- $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'pas2','aspassword'=>true,'value'=>$cl_password2));
+ $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
+ $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));
}
$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 300px;','value'=>$cl_email));
@@ -127,23 +127,23 @@ $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','for
// 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->setValue('');
+ $this->setOptions(array('width'=>200));
+ $this->setValue('');
return $this->toString();
}
}
class RateCellRenderer extends DefaultCellRenderer {
function render(&$table, $value, $row, $column, $selected = false) {
global $assigned_projects;
- $field = new FloatField('rate_'.$table->getValueAtName($row,'id'), $table->getValueAtName($row, 'p_rate'));
+
+ $field = new FloatField('rate_'.$table->getValueAtName($row,'id'));
$field->setFormName($table->getFormName());
- $field->setLocalization($GLOBALS['I18N']);
$field->setSize(5);
$field->setFormat('.2');
foreach ($assigned_projects as $p) {
if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
}
- $this->setValue($field->toStringControl());
+ $this->setValue($field->getHtml());
return $this->toString();
}
}
@@ -173,6 +173,8 @@ if ($request->isPost()) {
$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') && $cl_role == ROLE_CLIENT && !$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()) {