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

monitoring/config: Rename URL paramter backend to backend-name 

Else the parameter conflicts w/ the module-wide paramter backend for choosing the data source.
This commit is contained in:
Eric Lippmann 2015-09-03 17:03:33 +02:00
parent c19e850df3
commit 5651392ce7
2 changed files with 4 additions and 4 deletions
modules/monitoring/application
controllers
ConfigController.php
views/scripts/config
index.phtml

4
modules/monitoring/application/controllers/ConfigController.php
View File

@ -34,7 +34,7 @@ class ConfigController extends Controller
*/ */
public function editbackendAction() public function editbackendAction()
{ {
$backendName = $this->params->getRequired('backend'); $backendName = $this->params->getRequired('backend-name');
$form = new BackendConfigForm(); $form = new BackendConfigForm();
$form->setRedirectUrl('monitoring/config'); $form->setRedirectUrl('monitoring/config');
@ -120,7 +120,7 @@ class ConfigController extends Controller
*/ */
public function removebackendAction() public function removebackendAction()
{ {
$backendName = $this->params->getRequired('backend'); $backendName = $this->params->getRequired('backend-name');
$backendForm = new BackendConfigForm(); $backendForm = new BackendConfigForm();
$backendForm->setIniConfig($this->Config('backends')); $backendForm->setIniConfig($this->Config('backends'));

4
modules/monitoring/application/views/scripts/config/index.phtml
View File

@ -21,7 +21,7 @@
<?= $this->qlink( <?= $this->qlink(
$backendName, $backendName,
'/monitoring/config/editbackend', '/monitoring/config/editbackend',
array('backend' => $backendName), array('backend-name' => $backendName),
array( array(
'icon' => 'edit', 'icon' => 'edit',
'title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName) 'title' => sprintf($this->translate('Edit monitoring backend %s'), $backendName)
@ -36,7 +36,7 @@
<?= $this->qlink( <?= $this->qlink(
'', '',
'/monitoring/config/removebackend', '/monitoring/config/removebackend',
array('backend' => $backendName), array('backend-name' => $backendName),
array( array(
'icon' => 'trash', 'icon' => 'trash',
'title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName) 'title' => sprintf($this->translate('Remove monitoring backend %s'), $backendName)