Merge pull request #30 from dmdrozd/master

codeator · web-flow · commit 853cec3b7931 · 2018-10-01T17:20:30.000+03:00
Checking if form is not defined
diff --git a/src/Form/Element.php b/src/Form/Element.php
@@ -174,7 +174,10 @@ public function render()
 
     public function disableIfNeeded()
     {
-        if ($this->isDisabled || $this->form->isDisabled())
+        $isElementDisabled = $this->isDisabled;
+        $isFormDisabled    = $this->form ? $this->form->isDisabled() : false;
+
+        if ($isElementDisabled || $isFormDisabled)
         {
             $this->addAttributes(['disabled' => 'disabled']);
         }

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,10 @@ public function render()`
`174`	`174`
`175`	`175`	`public function disableIfNeeded()`
`176`	`176`	`{`
`177`		`- if ($this->isDisabled \|\| $this->form->isDisabled())`
	`177`	`+ $isElementDisabled = $this->isDisabled;`
	`178`	`+ $isFormDisabled = $this->form ? $this->form->isDisabled() : false;`
	`179`	`+`
	`180`	`+ if ($isElementDisabled \|\| $isFormDisabled)`
`178`	`181`	`{`
`179`	`182`	`$this->addAttributes(['disabled' => 'disabled']);`
`180`	`183`	`}`