Don't set modal opener attrs manually

Icinga · Sep 12, 2023 · 141bae1 · 141bae1
1 parent 6ccb9e3
commit 141bae1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 62 deletions.
diff --git a/application/controllers/ReportController.php b/application/controllers/ReportController.php
@@ -296,56 +296,40 @@ protected function assembleActions()
 
         if ($this->hasPermission('reporting/reports')) {
             $actions->addHtml(
-                new ActionLink(
+                (new ActionLink(
                     $this->translate('Modify'),
                     Url::fromPath('reporting/report/edit', ['id' => $reportId]),
-                    'edit',
-                    [
-                        'data-icinga-modal'   => true,
-                        'data-no-icinga-ajax' => true
-                    ]
-                )
+                    'edit'
+                ))->openInModal()
             );
 
             $actions->addHtml(
-                new ActionLink(
+                (new ActionLink(
                     $this->translate('Clone'),
                     Url::fromPath('reporting/report/clone', ['id' => $reportId]),
-                    'clone',
-                    [
-                        'data-icinga-modal'   => true,
-                        'data-no-icinga-ajax' => true
-                    ]
-                )
+                    'clone'
+                ))->openInModal()
             );
         }
 
         if ($this->hasPermission('reporting/schedules')) {
             $actions->addHtml(
-                new ActionLink(
+                (new ActionLink(
                     $this->translate('Schedule'),
                     Url::fromPath('reporting/report/schedule', ['id' => $reportId]),
-                    'calendar-empty',
-                    [
-                        'data-icinga-modal'   => true,
-                        'data-no-icinga-ajax' => true
-                    ]
-                )
+                    'calendar-empty'
+                ))->openInModal()
             );
         }
 
         $actions
             ->add($download)
             ->addHtml(
-                new ActionLink(
+                (new ActionLink(
                     $this->translate('Send'),
                     Url::fromPath('reporting/report/send', ['id' => $reportId]),
-                    'forward',
-                    [
-                        'data-icinga-modal'   => true,
-                        'data-no-icinga-ajax' => true
-                    ]
-                )
+                    'forward'
+                ))->openInModal()
             );
 
         return $actions;

diff --git a/application/controllers/ReportsController.php b/application/controllers/ReportsController.php
@@ -27,15 +27,13 @@ public function indexAction()
         $this->getTabs()->getAttributes()->set('data-base-target', '_main');
 
         if ($this->hasPermission('reporting/reports')) {
-            $this->addControl(new ButtonLink(
-                $this->translate('New Report'),
-                Url::fromPath('reporting/reports/new'),
-                'plus',
-                [
-                    'data-icinga-modal'   => true,
-                    'data-no-icinga-ajax' => true
-                ]
-            ));
+            $this->addControl(
+                (new ButtonLink(
+                    $this->translate('New Report'),
+                    Url::fromPath('reporting/reports/new'),
+                    'plus'
+                ))->openInModal()
+            );
         }
 
         $tableRows = [];

diff --git a/application/controllers/TemplateController.php b/application/controllers/TemplateController.php
@@ -92,15 +92,11 @@ protected function createActionBars(): ValidHtml
     {
         $actions = new ActionBar();
         $actions->addHtml(
-            new ActionLink(
+            (new ActionLink(
                 $this->translate('Modify'),
                 Url::fromPath('reporting/template/edit', ['id' => $this->template->id]),
-                'edit',
-                [
-                    'data-icinga-modal'   => true,
-                    'data-no-icinga-ajax' => true
-                ]
-            )
+                'edit'
+            ))->openInModal()
         );
 
         return $actions;

diff --git a/application/controllers/TemplatesController.php b/application/controllers/TemplatesController.php
@@ -27,15 +27,13 @@ public function indexAction()
         $canManage = $this->hasPermission('reporting/templates');
 
         if ($canManage) {
-            $this->addControl(new ButtonLink(
-                $this->translate('New Template'),
-                Url::fromPath('reporting/templates/new'),
-                'plus',
-                [
-                    'data-icinga-modal'   => true,
-                    'data-no-icinga-ajax' => true
-                ]
-            ));
+            $this->addControl(
+                (new ButtonLink(
+                    $this->translate('New Template'),
+                    Url::fromPath('reporting/templates/new'),
+                    'plus'
+                ))->openInModal()
+            );
         }
 
         $templates = Model\Template::on($this->getDb());

diff --git a/application/controllers/TimeframesController.php b/application/controllers/TimeframesController.php
@@ -27,15 +27,13 @@ public function indexAction()
         $canManage = $this->hasPermission('reporting/timeframes');
 
         if ($canManage) {
-            $this->addControl(new ButtonLink(
-                $this->translate('New Timeframe'),
-                Url::fromPath('reporting/timeframes/new'),
-                'plus',
-                [
-                    'data-icinga-modal'   => true,
-                    'data-no-icinga-ajax' => true
-                ]
-            ));
+            $this->addControl(
+                (new ButtonLink(
+                    $this->translate('New Timeframe'),
+                    Url::fromPath('reporting/timeframes/new'),
+                    'plus'
+                ))->openInModal()
+            );
         }
 
         $tableRows = [];