IcingaObjectFieldLoader: no mandatory field on cmd

fixes #12644
Icinga · Jan 13, 2017 · f874a79 · f874a79
1 parent f845c2c
commit f874a79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/library/Director/Objects/DirectorDatafield.php b/library/Director/Objects/DirectorDatafield.php
@@ -81,7 +81,9 @@ public function getFormElement(DirectorObjectForm $form, $name = null)
         $dataType->setSettings($this->getSettings());
         $el = $dataType->getFormElement($name, $form);
 
-        if ($this->getSetting('is_required') === 'y') {
+        if ($this->getSetting('icinga_type') !== 'command'
+            && $this->getSetting('is_required') === 'y'
+        ) {
             $el->setRequired(true);
         }
         if ($caption = $this->get('caption')) {

diff --git a/library/Director/Web/Form/IcingaObjectFieldLoader.php b/library/Director/Web/Form/IcingaObjectFieldLoader.php
@@ -467,6 +467,7 @@ protected function prepareSelectForIds(array $ids)
             array('df' => 'director_datafield'),
             array(
                 'object_id'   => $idColumn,
+                'icinga_type' => "('" . $object->getShortTableName() . "')",
                 'var_filter'  => 'f.var_filter',
                 'is_required' => 'f.is_required',
                 'id'          => 'df.id',