lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(mvc) some more fixes

Browse Source
This commit is contained in:
Ad Schellevis 2016-02-29 22:36:49 +01:00
parent 4bb60ba2ab
commit d98bf23d2d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php
View File

@ -154,8 +154,8 @@ class JsonKeyValueStoreField extends BaseField
public function getNodeData()
{
$result = array ();
// if relation is not required, add empty option
if (!$this->internalIsRequired) {
// if relation is not required and single, add empty option
if (!$this->internalIsRequired && !$this->internalMultiSelect) {
$result[""] = array("value"=>$this->internalEmptyDescription, "selected" => 0);
}
@ -182,13 +182,13 @@ class JsonKeyValueStoreField extends BaseField
$validators = parent::getValidators();
if ($this->internalValue != null) {
if ($this->internalMultiSelect) {
// field may contain more than one authentication server
// field may contain more than one value
$validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage,
'domain'=>array_keys($this->internalOptionList[$this->internalCacheKey])));
'domain'=>array_keys($this->internalOptionList)));
} else {
// single authentication server selection
// single value selection
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain'=>array_keys($this->internalOptionList[$this->internalCacheKey])));
'domain'=>array_keys($this->internalOptionList)));
}
}
return $validators;