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/can-t-progress-in-wizard-due-to-error-2842' 

fixes #2842
This commit is contained in:
Alexander A. Klimov 2017-07-05 14:40:10 +02:00
parent 375920f761 5460465e07
commit 6848ed6c1e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/application/forms/Config/TransportConfigForm.php
View File

@ -270,9 +270,6 @@ class TransportConfigForm extends ConfigForm
parent::addSubmitButton();
if ($this->getSubForm('transport_form') instanceof ApiTransportForm) {
$this->getElement('btn_submit')
->setDecorators(array('ViewHelper'));
$this->addElement(
'submit',
'transport_validation',
@ -296,8 +293,15 @@ class TransportConfigForm extends ConfigForm
)
);
$btnSubmit = $this->getElement('btn_submit');
$elements = array('transport_validation', 'transport-progress');
if ($btnSubmit !== null) {
// In the setup wizard $this is being used as a subform which doesn't have a submit button.
$btnSubmit->setDecorators(array('ViewHelper'));
array_unshift($elements, 'btn_submit');
}
$this->addDisplayGroup(
array('btn_submit', 'transport_validation', 'transport-progress'),
$elements,
'submit_validation',
array(
'decorators' => array(