BaseControl: fixed un-omitting disabled controls [ref nette#90]

Author: matej21

src/Forms/Controls/BaseControl.php

@@ -52,8 +52,8 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var bool */
 	protected $disabled = FALSE;
 
-	/** @var bool */
-	private $omitted = FALSE;
+	/** @var bool|null */
+	private $omitted;
 
 	/** @var Nette\Forms\Rules */
 	private $rules;
@@ -225,7 +225,7 @@ public function setOmitted($value = TRUE)
 	 */
 	public function isOmitted()
 	{
-		return $this->omitted || $this->disabled;
+		return $this->omitted || ($this->disabled && $this->omitted !== FALSE);
 	}
 
 

tests/Forms/Forms.omittedValue.phpt

@@ -19,3 +19,22 @@ $form->addText('omittedInput')
 	->setOmitted();
 
 Assert::same(['input' => ''], $form->getValues(TRUE));
+
+
+$form = new Form('name');
+$form->addText('input')
+	->setDisabled()->setDisabled(FALSE);
+
+Assert::same(['input' => ''], $form->getValues(TRUE));
+
+$form = new Form('name');
+$form->addText('input')
+	->setDisabled()->setOmitted(FALSE);
+
+Assert::same(['input' => ''], $form->getValues(TRUE));
+
+$form = new Form('name');
+$form->addText('input')
+	->setDisabled();
+
+Assert::same([], $form->getValues(TRUE));