tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593

This commit is contained in:
Eric Lippmann 2014-09-01 14:50:32 +02:00
parent 57dd9a699e 0822aff293
commit 30965c247b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Web/Form.php
View File

@ -370,7 +370,15 @@ class Form extends Zend_Form
if ($el->getAttrib('autosubmit')) { if ($el->getAttrib('autosubmit')) {
// Need to add this decorator first or it interferes with the other's two HTML otherwise // Need to add this decorator first or it interferes with the other's two HTML otherwise
$el->addDecorator(new NoScriptApply()); // Non-JS environments $el->addDecorator(new NoScriptApply()); // Non-JS environments
$el->setAttrib('class', 'autosubmit'); // JS environments $class = $el->getAttrib('class');
if (is_array($class)) {
$class[] = 'autosubmit';
} elseif ($class === null) {
$class = 'autosubmit';
} else {
$class .= ' autosubmit';
}
$el->setAttrib('class', $class); // JS environments
unset($el->autosubmit); unset($el->autosubmit);
} }
@ -577,8 +585,8 @@ class Form extends Zend_Form
if (! $name) { if (! $name) {
$name = get_class($this); $name = get_class($this);
$this->setName($name); $this->setName($name);
$name = parent::getName();
} }
return $name; return $name;
} }