AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move validator methods

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-14 20:18:13 -05:00
parent dc35a78374
commit 805be7d331
33 changed files with 605 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/Model/CustomFilter.php
View File

@@ -2,9 +2,6 @@
namespace Kanboard\Model;
use SimpleValidator\Validator;
use SimpleValidator\Validators;
/**
* Custom Filter model
*
@@ -102,63 +99,4 @@ class CustomFilter extends Base
{
return $this->db->table(self::TABLE)->eq('id', $filter_id)->remove();
}
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\Required('project_id', t('Field required')),
new Validators\Required('user_id', t('Field required')),
new Validators\Required('name', t('Field required')),
new Validators\Required('filter', t('Field required')),
new Validators\Integer('user_id', t('This value must be an integer')),
new Validators\Integer('project_id', t('This value must be an integer')),
new Validators\MaxLength('name', t('The maximum length is %d characters', 100), 100),
new Validators\MaxLength('filter', t('The maximum length is %d characters', 100), 100)
);
}
/**
* Validate filter creation
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateCreation(array $values)
{
$v = new Validator($values, $this->commonValidationRules());
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate filter modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateModification(array $values)
{
$rules = array(
new Validators\Required('id', t('Field required')),
new Validators\Integer('id', t('This value must be an integer')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
}