Form: Implement form element attribute ignoreDefault

refs #6080
Icinga · Jan 13, 2017 · 07372d6 · 07372d6
1 parent 1623722
commit 07372d6
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
@@ -1133,6 +1133,31 @@ public function populate(array $defaults)
         return parent::populate($defaults);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getValues($suppressArrayNotation = false) {
+        $values = parent::getValues($suppressArrayNotation);
+        foreach ($values as $key => & $value){
+            $el = $this->getElement($key);
+            if ($el) {
+                if ($el->getAttrib('ignoreDefault')) {
+                    if (get_class($el) === 'Zend_Form_Element_Checkbox') {
+                        if ($el->isChecked() === $this->getDefaultValue($key)) {
+                            $value = null;
+                        }
+                    } else {
+                        if ($value === $this->getDefaultValue($key)) {
+                            $value = null;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $values;
+    }
+
     /**
      * Recurse the given form and unset all unchanged default values
      *