Don't use extra updates for http requests (#223)

fixes #217
Icinga · Nov 16, 2023 · 320501a · 320501a
2 parents 7676092 + ae605d5
commit 320501a
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/application/controllers/ReportController.php b/application/controllers/ReportController.php
@@ -53,14 +53,25 @@ public function indexAction()
         $this->controls->getAttributes()->add('class', 'default-layout');
         $this->addControl($this->assembleActions());
 
-        /** @var string $contentId */
-        $contentId = $this->content->getAttributes()->get('id')->getValue();
-        $this->sendExtraUpdates([
-            $contentId => Url::fromPath('reporting/report/content', ['id' => $this->report->getId()])
-        ]);
-
-        // Will be replaced once the report content is rendered
-        $this->addContent(new HtmlElement('div'));
+        if ($this->isXhr()) {
+            /** @var string $contentId */
+            $contentId = $this->content->getAttributes()->get('id')->getValue();
+            $this->sendExtraUpdates([
+                $contentId => Url::fromPath('reporting/report/content', ['id' => $this->report->getId()])
+            ]);
+
+            // Will be replaced once the report content is rendered
+            $this->addContent(new HtmlElement('div'));
+        } else {
+            Environment::raiseExecutionTime();
+            Environment::raiseMemoryLimit();
+
+            try {
+                $this->addContent($this->report->toHtml());
+            } catch (Exception $e) {
+                $this->addContent(Error::show($e));
+            }
+        }
     }
 
     public function contentAction(): void