lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #869 from fraenki/pr_868

Browse Source 
support multiple values in ModelRelationField, fixes #868
This commit is contained in:
Ad Schellevis 2016-03-30 20:13:07 +02:00
commit 78ca17104c
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Validation\Validator\InclusionIn;
use OPNsense\Base\Validators\CsvListValidator;
/**
* Class ModelRelationField defines a relation to another entity within the model, acts like a select item.
@ -42,6 +43,11 @@ class ModelRelationField extends BaseField
*/
protected $internalIsContainer = false;
/**
* @var bool field may contain multiple data nodes at once
*/
private $internalMultiSelect = false;
/**
* @var string default validation message string
*/
@ -107,6 +113,19 @@ class ModelRelationField extends BaseField
}
}
/**
* select if multiple data nodes may be selected at once
* @param $value boolean value Y/N
*/
public function setmultiple($value)
{
if (trim(strtoupper($value)) == "Y") {
$this->internalMultiSelect = true;
} else {
$this->internalMultiSelect = false;
}
}
/**
* get valid options, descriptions and selected value
* @return array
@ -121,8 +140,9 @@ class ModelRelationField extends BaseField
$result[""] = array("value"=>"none", "selected" => 0);
}
$datanodes = explode(',', $this->internalValue);
foreach (self::$internalOptionList[$this->internalCacheKey] as $optKey => $optValue) {
if ($optKey == $this->internalValue && $this->internalValue != null) {
if (in_array($optKey, $datanodes)) {
$selected = 1;
} else {
$selected = 0;
@ -142,14 +162,9 @@ class ModelRelationField extends BaseField
{
$validators = parent::getValidators();
if ($this->internalValue != null) {
if (array_key_exists($this->internalCacheKey, self::$internalOptionList) &&
count(self::$internalOptionList[$this->internalCacheKey]) > 0) {
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain' => array_keys(self::$internalOptionList[$this->internalCacheKey])));
} else {
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain' => array()));
}
// field may contain more than one entries
$validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList[$this->internalCacheKey])));
}
return $validators;
}