lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(mvc) improve ModelRelation validation

Browse Source
This commit is contained in:
Ad Schellevis 2015-05-28 18:37:41 +02:00
parent 212a5e48b7
commit e287e1065b
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php
View File

@ -29,7 +29,7 @@
*/
namespace OPNsense\Base\FieldTypes;
use Phalcon\Validation\Validator\Regex;
use Phalcon\Validation\Validator\InclusionIn;
/**
* Class ModelRelationField defines a relation to another entity within the model, acts like a select item.
@ -102,25 +102,16 @@ class ModelRelationField extends BaseField
*/
public function getValidators()
{
// build validation mask
$validationMask = '(';
$countid = 0 ;
foreach (self::$internalOptionList as $key => $value) {
if ($countid > 0) {
$validationMask .= '|';
}
$validationMask .= $key ;
$countid++;
}
$validationMask .= ')';
if ($this->internalValidationMessage == null) {
$msg = "option not in list" ;
$msg = "option not in list";
} else {
$msg = $this->internalValidationMessage;
}
if (($this->internalIsRequired == true || $this->internalValue != null) && $validationMask != null) {
return array(new Regex(array('message' => $msg,'pattern'=>trim($validationMask))));
if (($this->internalIsRequired == true || $this->internalValue != null) &&
count(self::$internalOptionList) > 0
) {
return array(new InclusionIn(array('message' => $msg, 'domain' => array_keys(self::$internalOptionList))));
} else {
// empty field and not required, skip this validation.
return array();