tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-25 18:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix moving panes around using drag&drop doesn't update the tabs sometimes

Browse Source
This commit is contained in:
Yonas Habteab 2022-06-10 19:54:09 +02:00
parent 826e39ce91
commit 22d483b515
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/Icinga/Web/Dashboard/Common/DashboardEntries.php
View File

@ -119,25 +119,36 @@ trait DashboardEntries
)); ));
} }
if (! $this->hasEntry($dashboard->getName())) { if (! $this->hasEntries() || count($this->getEntries()) === $position) {
$dashboard->setPriority($position); $dashboard->setPriority($position);
$data = [$dashboard]; $data = array_merge(array_values($this->getEntries()), [$dashboard]);
} else { } else {
if (! $this->hasEntry($dashboard->getName())) {
$this->addEntry($dashboard);
}
$data = array_values($this->getEntries()); $data = array_values($this->getEntries());
array_splice($data, array_search(strtolower($dashboard->getName()), array_keys($this->getEntries())), 1); array_splice($data, array_search(strtolower($dashboard->getName()), array_keys($this->getEntries())), 1);
array_splice($data, $position, 0, [$dashboard]); array_splice($data, $position, 0, [$dashboard]);
// We have copied the data with the new dashboard entry, so we need to unset
// the passed entry from another entry to prevent duplicate entry errors
if ($origin && $origin->hasEntry($dashboard->getName())) {
$this->unsetEntry($dashboard);
}
} }
$entries = []; $entries = [];
foreach ($data as $index => $item) { foreach ($data as $index => $item) {
if (count($data) !== 1) { if (count($data) > 1) {
$item->setPriority($index); $item->setPriority($index);
} }
$entries[$item->getName()] = $item; $entries[$item->getName()] = $item;
$this->manageEntry($item, $dashboard->getName() === $item->getName() ? $origin : null); $this->manageEntry($item, $dashboard->getName() === $item->getName() ? $origin : null);
if ($dashboard->getName() === $item->getName() && $origin) { if ($origin && $dashboard->getName() === $item->getName()) {
// The dashboard entry is moved to another one
$origin->unsetEntry($dashboard); $origin->unsetEntry($dashboard);
} }
} }