Commit 115d63b9 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner

(mvc) regression JsonKeyValueStoreField

(cherry picked from commit 4bb60ba2)
parent 2f1266e6
...@@ -121,7 +121,6 @@ class JsonKeyValueStoreField extends BaseField ...@@ -121,7 +121,6 @@ class JsonKeyValueStoreField extends BaseField
protected function actionPostLoadingEvent() protected function actionPostLoadingEvent()
{ {
if ($this->internalSourceField != null && $this->internalSourceFile != null) { if ($this->internalSourceField != null && $this->internalSourceFile != null) {
//$this->internalOptionList[$key] = $value ;
$sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField); $sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
if (is_file($sourcefile)) { if (is_file($sourcefile)) {
$data = json_decode(file_get_contents($sourcefile), true); $data = json_decode(file_get_contents($sourcefile), true);
...@@ -185,11 +184,11 @@ class JsonKeyValueStoreField extends BaseField ...@@ -185,11 +184,11 @@ class JsonKeyValueStoreField extends BaseField
if ($this->internalMultiSelect) { if ($this->internalMultiSelect) {
// field may contain more than one authentication server // field may contain more than one authentication server
$validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage, $validators[] = new CsvListValidator(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList[$this->internalCacheKey]))); 'domain'=>array_keys($this->internalOptionList[$this->internalCacheKey])));
} else { } else {
// single authentication server selection // single authentication server selection
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage, $validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList[$this->internalCacheKey]))); 'domain'=>array_keys($this->internalOptionList[$this->internalCacheKey])));
} }
} }
return $validators; return $validators;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment