tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

DataTypeDatalist: allow Array destination type

Browse Source 
fixes #1080
This commit is contained in:
Thomas Gelf 2017-08-28 09:23:35 +02:00
parent 2ef865392b
commit d37af09190
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/Director/DataType/DataTypeDatalist.php
View File

@ -11,12 +11,20 @@ class DataTypeDatalist extends DataTypeHook
{ {
public function getFormElement($name, QuickForm $form) public function getFormElement($name, QuickForm $form)
{ {
$element = $form->createElement('select', $name, array( $enum = $this->getEntries($form);
'multiOptions' => array(null => '- please choose -') + $params = [];
$this->getEntries($form), if ($this->getSetting('data_type') === 'array') {
)); $type = 'extensibleSet';
$params['sorted'] = true;
$params = ['multiOptions' => $enum];
} else {
$params = ['multiOptions' => [
null => $form->translate('- please choose -'),
] + $enum];
$type = 'select';
}
return $element; return $form->createElement($type, $name, $params);
} }
protected function getEntries(QuickForm $form) protected function getEntries(QuickForm $form)
@ -50,6 +58,16 @@ class DataTypeDatalist extends DataTypeHook
'multiOptions' => array(null => '- please choose -') + 'multiOptions' => array(null => '- please choose -') +
$db->enumDatalist(), $db->enumDatalist(),
)); ));
$form->addElement('select', 'data_type', [
'label' => $form->translate('Target data type'),
'multiOptions' => $form->optionalEnum([
'string' => $form->translate('String'),
'array' => $form->translate('Array'),
]),
'required' => true,
]);
return $form; return $form;
} }
} }

2
library/Director/DataType/DataTypeDirectorObject.php
View File

@ -33,7 +33,7 @@ class DataTypeDirectorObject extends DataTypeHook
$enum = $db->fetchPairs($query); $enum = $db->fetchPairs($query);
$params = [];
if ($this->getSetting('data_type') === 'array') { if ($this->getSetting('data_type') === 'array') {
$type = 'extensibleSet'; $type = 'extensibleSet';
$params['sorted'] = true; $params['sorted'] = true;