From ee43fdad0a2cb337071a451b39179660db5da678 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 7 Sep 2015 13:21:31 +0200
Subject: [PATCH] DashboardPane: Consider dashlets when merging

refs #5600
---
 library/Icinga/Web/Navigation/DashboardPane.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/library/Icinga/Web/Navigation/DashboardPane.php b/library/Icinga/Web/Navigation/DashboardPane.php
index d1bfe2696..200287668 100644
--- a/library/Icinga/Web/Navigation/DashboardPane.php
+++ b/library/Icinga/Web/Navigation/DashboardPane.php
@@ -47,4 +47,17 @@ class DashboardPane extends NavigationItem
     {
         $this->setUrl(Url::fromPath('dashboard', array('pane' => $this->getName())));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function merge(NavigationItem $item)
+    {
+        parent::merge($item);
+
+        $this->setDashlets(array_merge(
+            $this->getDashlets(),
+            $item->getDashlets()
+        ));
+    }
 }