Form: Register form notifications as custom error messages for API re…

…quests I'd have liked to fix how we transmit validation messages in such cases, but for compatibilty reasons this has to suffice..
Icinga · Jul 13, 2017 · ed5ba14 · ed5ba14
1 parent 96c96df
commit ed5ba14
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
@@ -1580,7 +1580,12 @@ public function assertPermission($permission)
      */
     public function error($message, $markAsError = true)
     {
-        $this->addNotification($message, self::NOTIFICATION_ERROR);
+        if ($this->getIsApiTarget()) {
+            $this->addErrorMessage($message);
+        } else {
+            $this->addNotification($message, self::NOTIFICATION_ERROR);
+        }
+
         if ($markAsError) {
             $this->markAsError();
         }
@@ -1598,7 +1603,12 @@ public function error($message, $markAsError = true)
      */
     public function warning($message, $markAsError = true)
     {
-        $this->addNotification($message, self::NOTIFICATION_WARNING);
+        if ($this->getIsApiTarget()) {
+            $this->addErrorMessage($message);
+        } else {
+            $this->addNotification($message, self::NOTIFICATION_WARNING);
+        }
+
         if ($markAsError) {
             $this->markAsError();
         }
@@ -1616,7 +1626,12 @@ public function warning($message, $markAsError = true)
      */
     public function info($message, $markAsError = true)
     {
-        $this->addNotification($message, self::NOTIFICATION_INFO);
+        if ($this->getIsApiTarget()) {
+            $this->addErrorMessage($message);
+        } else {
+            $this->addNotification($message, self::NOTIFICATION_INFO);
+        }
+
         if ($markAsError) {
             $this->markAsError();
         }