diff options
Diffstat (limited to 'app/Validator')
| -rw-r--r-- | app/Validator/ProjectValidator.php | 12 | ||||
| -rw-r--r-- | app/Validator/TaskValidator.php | 2 | ||||
| -rw-r--r-- | app/Validator/UserValidator.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/Validator/ProjectValidator.php b/app/Validator/ProjectValidator.php index 8c6117a4..5b10026c 100644 --- a/app/Validator/ProjectValidator.php +++ b/app/Validator/ProjectValidator.php @@ -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')), ); diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php index e3b0eded..e824dc05 100644 --- a/app/Validator/TaskValidator.php +++ b/app/Validator/TaskValidator.php @@ -42,7 +42,7 @@ class TaskValidator extends BaseValidator new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200), new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50), new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getParserFormats()), - new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getParserFormats()), + new Validators\Date('date_started', t('Invalid date'), array($this->dateParser->getUserDateTimeFormat())), new Validators\Numeric('time_spent', t('This value must be numeric')), new Validators\Numeric('time_estimated', t('This value must be numeric')), ); diff --git a/app/Validator/UserValidator.php b/app/Validator/UserValidator.php index 9911de50..fe402c47 100644 --- a/app/Validator/UserValidator.php +++ b/app/Validator/UserValidator.php @@ -25,7 +25,7 @@ class UserValidator extends BaseValidator return array( new Validators\MaxLength('role', t('The maximum length is %d characters', 25), 25), new Validators\MaxLength('username', t('The maximum length is %d characters', 50), 50), - new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), UserModel::TABLE, 'id'), + new Validators\Unique('username', t('This username is already taken'), $this->db->getConnection(), UserModel::TABLE, 'id'), new Validators\Email('email', t('Email address invalid')), new Validators\Integer('is_ldap_user', t('This value must be an integer')), ); |