Refactoring/rewrite of modal boxes handling
This commit is contained in:
@@ -28,7 +28,6 @@ class ProjectValidator extends BaseValidator
|
||||
new Validators\Integer('priority_start', t('This value must be an integer')),
|
||||
new Validators\Integer('priority_end', t('This value must be an integer')),
|
||||
new Validators\Integer('is_active', t('This value must be an integer')),
|
||||
new Validators\NotEmpty('name', t('This field cannot be empty')),
|
||||
new Validators\MaxLength('name', t('The maximum length is %d characters', 50), 50),
|
||||
new Validators\MaxLength('identifier', t('The maximum length is %d characters', 50), 50),
|
||||
new Validators\MaxLength('start_date', t('The maximum length is %d characters', 10), 10),
|
||||
@@ -47,15 +46,15 @@ class ProjectValidator extends BaseValidator
|
||||
*/
|
||||
public function validateCreation(array $values)
|
||||
{
|
||||
$rules = array(
|
||||
new Validators\Required('name', t('The project name is required')),
|
||||
);
|
||||
|
||||
if (! empty($values['identifier'])) {
|
||||
$values['identifier'] = strtoupper($values['identifier']);
|
||||
}
|
||||
|
||||
$v = new Validator($values, array_merge($this->commonValidationRules(), $rules));
|
||||
$rules = array(
|
||||
new Validators\Required('name', t('The project name is required')),
|
||||
);
|
||||
|
||||
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
|
||||
|
||||
return array(
|
||||
$v->execute(),
|
||||
@@ -77,6 +76,7 @@ class ProjectValidator extends BaseValidator
|
||||
}
|
||||
|
||||
$rules = array(
|
||||
new Validators\NotEmpty('name', t('This field cannot be empty')),
|
||||
new Validators\Required('id', t('This value is required')),
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user