WIP

Icinga · Sep 6, 2023 · fb60421 · fb60421
1 parent 3452a33
commit fb60421
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 30 deletions.
diff --git a/application/controllers/ReportController.php b/application/controllers/ReportController.php
@@ -108,10 +108,7 @@ public function cloneAction()
             ->on(ReportForm::ON_SUCCESS, function () {
                 Notification::success($this->translate('Cloned report successfully'));
 
-                // Refresh the col1 container after cloning a report
-                $this->sendExtraUpdates(['#col1']);
-
-                $this->redirectNow(Url::fromPath('reporting/report', ['id' => $this->report->getId()]));
+                $this->closeCurrentAndRefreshRelatedView();
             })
             ->handleRequest($this->getServerRequest());
 
@@ -142,19 +139,15 @@ public function editAction()
             ->setAction((string) Url::fromRequest())
             ->populate($values)
             ->on(ReportForm::ON_SUCCESS, function (ReportForm $form) {
-                $url = '__CLOSE__';
                 if ($form->getPressedSubmitElement()->getName() === 'remove') {
                     Notification::success($this->translate('Removed report successfully'));
-                } else {
-                    $url = Url::fromPath('reporting/report', ['id' => $this->report->getId()]);
-
-                    // Refresh the col1 container after editing a report
-                    $this->sendExtraUpdates(['#col1']);
 
+                    $this->switchToLayout1Column();
+                } else {
                     Notification::success($this->translate('Updated report successfully'));
-                }
 
-                $this->redirectNow($url);
+                    $this->closeCurrentAndRefreshRelatedView();
+                }
             })
             ->handleRequest($this->getServerRequest());
 
@@ -172,7 +165,7 @@ public function sendAction()
             ->setReport($this->report)
             ->setAction((string) Url::fromRequest())
             ->on(SendForm::ON_SUCCESS, function () {
-                $this->redirectNow(Url::fromPath('reporting/report', ['id' => $this->report->getId()]));
+                $this->closeCurrentAndRefreshRelatedView();
             })
             ->handleRequest($this->getServerRequest());
 
@@ -198,7 +191,7 @@ public function scheduleAction()
                     Notification::success($this->translate('Created schedule successfully'));
                 }
 
-                $this->redirectNow(Url::fromPath('reporting/report', ['id' => $this->report->getId()]));
+                $this->closeCurrentAndRefreshRelatedView();
             })
             ->handleRequest($this->getServerRequest());
 

diff --git a/application/controllers/ReportsController.php b/application/controllers/ReportsController.php
@@ -126,22 +126,17 @@ public function newAction()
             ->on(ReportForm::ON_SUCCESS, function (ReportForm $form) use ($class) {
                 Notification::success($this->translate('Created report successfully'));
 
-                $url = Url::fromPath('reporting/reports');
+                $url = null;
                 if ($form->getPressedSubmitElement()->getName() === 'create_show') {
                     $url = Url::fromPath(
                         sprintf(
                             'reporting/reports#!%s',
                             Url::fromPath('reporting/report', ['id' => $form->getId()])->getAbsoluteUrl()
                         )
                     );
-                } elseif ($class !== null) {
-                    $url = '__CLOSE__';
-
-                    // This will close only the modal view and leave the object detail view of Icinga DB Web untouched.
-                    $this->getResponse()->setHeader('X-Icinga-Container', 'modal', true);
                 }
 
-                $this->redirectNow($url);
+                $this->closeCurrentAndRefreshRelatedView($url);
             })
             ->handleRequest($this->getServerRequest());
 

diff --git a/application/controllers/TemplateController.php b/application/controllers/TemplateController.php
@@ -69,16 +69,15 @@ public function editAction()
         $form = TemplateForm::fromTemplate($this->template)
             ->setAction((string) Url::fromRequest())
             ->on(TemplateForm::ON_SUCCESS, function (Form $form) {
-                $url = '__CLOSE__';
                 if ($form->getPressedSubmitElement()->getName() === 'remove') {
                     Notification::success($this->translate('Removed template successfully'));
-                } else {
-                    $url = Url::fromPath('reporting/template', ['id' => $this->template->id]);
 
+                    $this->switchToLayout1Column();
+                } else {
                     Notification::success($this->translate('Updated template successfully'));
-                }
 
-                $this->redirectNow($url);
+                    $this->closeCurrentAndRefreshRelatedView();
+                }
             })
             ->handleRequest(ServerRequest::fromGlobals());
 

diff --git a/application/controllers/TemplatesController.php b/application/controllers/TemplatesController.php
@@ -102,7 +102,7 @@ public function newAction()
             ->on(TemplateForm::ON_SUCCESS, function () {
                 Notification::success($this->translate('Created template successfully'));
 
-                $this->redirectNow(Url::fromPath('reporting/templates'));
+                $this->closeCurrentAndRefreshRelatedView();
             })
             ->handleRequest($this->getServerRequest());
 

diff --git a/application/controllers/TimeframeController.php b/application/controllers/TimeframeController.php
@@ -52,11 +52,13 @@ public function editAction()
             ->on(TimeframeForm::ON_SUCCESS, function (Form $form) {
                 if ($form->getPressedSubmitElement()->getName() === 'remove') {
                     Notification::success($this->translate('Removed timeframe successfully'));
+
+                    $this->switchToLayout1Column();
                 } else {
                     Notification::success($this->translate('Update timeframe successfully'));
-                }
 
-                $this->redirectNow('reporting/timeframes');
+                    $this->closeCurrentAndRefreshRelatedView();
+                }
             })->handleRequest($this->getServerRequest());
 
         $this->addContent($form);

diff --git a/application/controllers/TimeframesController.php b/application/controllers/TimeframesController.php
@@ -115,7 +115,7 @@ public function newAction()
             ->on(TimeframeForm::ON_SUCCESS, function () {
                 Notification::success($this->translate('Created timeframe successfully'));
 
-                $this->redirectNow('reporting/timeframes');
+                $this->closeCurrentAndRefreshRelatedView();
             })->handleRequest($this->getServerRequest());
 
         $this->addContent($form);