Fix: Review comments

Icinga · Jun 4, 2024 · 258191c · 258191c
1 parent 63410b4
commit 258191c
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/application/controllers/EventRuleController.php b/application/controllers/EventRuleController.php
@@ -48,9 +48,8 @@ public function indexAction(): void
         $ruleId = $this->params->getRequired('id');
 
         $eventRuleConfigValues = $this->fromDb((int) $ruleId);
-        $filter = $eventRuleConfigValues['object_filter'];  // Assignment by reference to is used as search editor is a
-                                                            // different form and the config must have the updated
-                                                            // object_filter as soon as the search editor is closed
+
+        $filter = $eventRuleConfigValues['object_filter'];
 
         if ($this->getRequest()->isPost()) {
             if ($this->getRequest()->has('searchbar')) {
@@ -294,26 +293,16 @@ public function editAction(): void
         $eventRuleForm = (new EventRuleForm())
             ->populate($config)
             ->setAction(Url::fromRequest()->getAbsoluteUrl())
-            ->on(Form::ON_SUCCESS, function ($form) use ($ruleId, $db) {
+            ->on(Form::ON_SUCCESS, function (EventRuleForm $form) use ($ruleId, $db) {
                 if ($ruleId === '-1') {
-                    $db->insert('rule', [
-                        'name'          => $form->getValue('name'),
-                        'timeperiod_id' => null,
-                        'object_filter' => null,
-                        'is_active'     => $form->getValue('is_active')
-                    ]);
-
+                    $db->insert('rule', $form->getValues());
                     $id = $db->lastInsertId();
 
                     $this->getResponse()->setHeader('X-Icinga-Container', 'col2');
                     $this->sendExtraUpdates(['#col1']);
                     $this->redirectNow(Links::eventRule($id));
                 } else {
-                    $db->update('rule', [
-                        'name'          => $form->getValue('name'),
-                        'is_active'     => $form->getValue('is_active')
-                    ], ['id = ?' => $ruleId]);
-
+                    $db->update('rule', $form->getValues(), ['id = ?' => $ruleId]);
                     $this->sendExtraUpdates([
                         '#event-rule-form' =>  Url::fromPath(
                             'notifications/event-rule/rule', ['id' => $ruleId]