tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Assignments: need Db for distinct vars enum 

fixes #11545
This commit is contained in:
Thomas Gelf 2016-04-08 00:46:35 +02:00
parent 630cf488f1
commit 936145fe46
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/AssignListSubForm.php
View File

@ -30,6 +30,7 @@ class AssignListSubForm extends QuickSubForm
foreach ($this->object->assignments()->getFormValues() as $values) {
$idx++;
$sub = new AssignmentSubForm();
$sub->setObject($this->object);
$sub->setup();
$sub->populate($values);
$this->addSubForm($sub, $idx);
@ -38,6 +39,7 @@ class AssignListSubForm extends QuickSubForm
$idx++;
$sub = new AssignmentSubForm();
$sub->setObject($this->object);
$sub->setup();
$this->addSubForm($sub, $idx);
$this->addElement('submit', 'addmore', array(

11
application/forms/AssignmentSubForm.php
View File

@ -3,10 +3,13 @@
namespace Icinga\Module\Director\Forms;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Web\Form\QuickSubForm;
class AssignmentSubForm extends QuickSubForm
{
protected $object;
// @codingStandardsIgnoreStart
protected $_disableLoadDefaultDecorators = true;
// @codingStandardsIgnoreEnd
@ -24,7 +27,7 @@ class AssignmentSubForm extends QuickSubForm
$this->addElement('select', 'property', array(
'label' => $this->translate('Property'),
'class' => 'assign-property autosubmit',
'multiOptions' => $this->optionalEnum(IcingaHost::enumProperties($this->db, 'host.'))
'multiOptions' => $this->optionalEnum(IcingaHost::enumProperties($this->object->getConnection(), 'host.'))
));
$this->addElement('select', 'operator', array(
'label' => $this->translate('Operator'),
@ -62,6 +65,12 @@ class AssignmentSubForm extends QuickSubForm
}
}
public function setObject(IcingaObject $object)
{
$this->object = $object;
return $this;
}
public function loadDefaultDecorators()
{
$this->setDecorators(array(