Merge branch 'bugfix/x-icinga-windowid-auto-refresh'

2017-11-21 12:42:51 +01:00 · 2017-11-21 12:42:51 +01:00 · 7fef9bddde
parent 745674dbe4 71fe12393d
commit 7fef9bddde
1 changed files with 3 additions and 1 deletions
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@ -114,8 +114,10 @@ class Request extends Zend_Controller_Request_Http
    public function protectId($id)
    {
        if (! isset($this->uniqueId)) {
-            $this->uniqueId = Window::generateId();
+            $windowId = $this->getHeader('X-Icinga-WindowId');
+            $this->uniqueId = empty($windowId) ? Window::generateId() : $windowId;
        }
+
        return $id . '-' . $this->uniqueId;
    }
 }