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

Merge branch 'bugfix/endpoint-remove-import-12920' 

fixes #12920
This commit is contained in:
Markus Frosch 2016-10-13 16:53:59 +02:00
parent cf4dccc817 255a02cf36
commit f527e31b14
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/forms/IcingaEndpointForm.php
View File

@ -47,8 +47,14 @@ class IcingaEndpointForm extends DirectorObjectForm
'multiOptions' => $this->optionalEnum($this->db->enumApiUsers()) 'multiOptions' => $this->optionalEnum($this->db->enumApiUsers())
)); ));
$this->addZoneElement() $this->addZoneElement();
->addImportsElement();
if ($this->object->hasBeenLoadedFromDb()) {
$imports = $this->object->get('imports');
if ($imports !== null && count($imports) > 0) {
$this->addImportsElement(false);
}
}
$this->setButtons(); $this->setButtons();
} }

5
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -14,6 +14,7 @@ abstract class DirectorObjectForm extends QuickForm
{ {
protected $db; protected $db;
/** @var IcingaObject */
protected $object; protected $object;
protected $objectName; protected $objectName;
@ -1151,7 +1152,7 @@ abstract class DirectorObjectForm extends QuickForm
return $this; return $this;
} }
protected function addImportsElement() protected function addImportsElement($required = null)
{ {
$enum = $this->enumAllowedTemplates(); $enum = $this->enumAllowedTemplates();
if (empty($enum)) { if (empty($enum)) {
@ -1165,7 +1166,7 @@ abstract class DirectorObjectForm extends QuickForm
. ' matters when importing properties from multiple templates: last one' . ' matters when importing properties from multiple templates: last one'
. ' wins' . ' wins'
), ),
'required' => !$this->isTemplate(), 'required' => ($required !== null ? $required : !$this->isTemplate()),
'multiOptions' => $this->optionallyAddFromEnum($enum), 'multiOptions' => $this->optionallyAddFromEnum($enum),
'sorted' => true, 'sorted' => true,
'class' => 'autosubmit' 'class' => 'autosubmit'