tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-22 17:37:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up for 63802dfc4

Browse Source
This commit is contained in:
Johannes Meyer 2022-04-22 08:57:59 +02:00
parent 2732d7df66
commit fdc9b36ee5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/DashboardsController.php
View File

@ -249,6 +249,11 @@ class DashboardsController extends CompatController
$this->dashboard->load(); $this->dashboard->load();
$home = $this->params->getRequired('home');
// TODO: Shouldn't be necessary. load() should get the name already and
// the form should otherwise ensure it has the required data
$this->dashboard->activateHome($this->dashboard->getEntry($home));
$dashletForm = new DashletForm($this->dashboard); $dashletForm = new DashletForm($this->dashboard);
$dashletForm->populate($this->getRequest()->getPost()); $dashletForm->populate($this->getRequest()->getPost());
$dashletForm->on(DashletForm::ON_SUCCESS, function () { $dashletForm->on(DashletForm::ON_SUCCESS, function () {

2
application/forms/Dashboard/DashletForm.php
View File

@ -56,7 +56,7 @@ class DashletForm extends SetupNewDashboardForm
$panes = $firstHome->getEntryKeyTitleArr(); $panes = $firstHome->getEntryKeyTitleArr();
} }
} else { } else {
$panes = $activeHome->getEntryKeyTitleArr(); $panes = $activeHome->loadDashboardEntries()->getEntryKeyTitleArr();
} }
} elseif ($this->dashboard->hasEntry($populatedHome)) { } elseif ($this->dashboard->hasEntry($populatedHome)) {
$this->dashboard->loadDashboardEntries($populatedHome); $this->dashboard->loadDashboardEntries($populatedHome);