From 3d9a84371b4c07c0b98914801be8afd7d2417505 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Jun 2014 18:12:49 +0200
Subject: Fix automatic error messages when Taskmanager::submit fails

---
 inc/taskmanager.inc.php      | 2 +-
 modules/systemstatus.inc.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php
index 1bbdb7a5..3862ac72 100644
--- a/inc/taskmanager.inc.php
+++ b/inc/taskmanager.inc.php
@@ -38,7 +38,7 @@ class Taskmanager
 		$reply = self::readReply($seq);
 		if ($reply === false || !is_array($reply) || !isset($reply['id'])
 				|| (isset($reply['statusCode']) && $reply['statusCode'] === NO_SUCH_TASK)) {
-			self::addErrorMessage(false);
+			self::addErrorMessage($reply);
 			return false;
 		}
 		return $reply;
diff --git a/modules/systemstatus.inc.php b/modules/systemstatus.inc.php
index 67ff4415..8f3d8322 100644
--- a/modules/systemstatus.inc.php
+++ b/modules/systemstatus.inc.php
@@ -41,10 +41,12 @@ class Page_SystemStatus extends Page
 			return;
 
 		$action = 'ajax' . Request::any('action');
-		if (method_exists($this, $action))
+		if (method_exists($this, $action)) {
 			$this->$action();
-		else
+			Message::renderList();
+		} else {
 			echo "Action $action not known in " . get_class();
+		}
 	}
 
 	protected function ajaxDiskStat()
@@ -56,7 +58,6 @@ class Page_SystemStatus extends Page
 
 		if (!isset($task['data']['list']) || empty($task['data']['list'])) {
 			Taskmanager::addErrorMessage($task);
-			Message::renderList();
 			return;
 		}
 		$store = Property::getVmStoreUrl();
@@ -114,7 +115,6 @@ class Page_SystemStatus extends Page
 
 		if (!isset($task['data']['addresses']) || empty($task['data']['addresses'])) {
 			Taskmanager::addErrorMessage($task);
-			Message::renderList();
 			return;
 		}
 
-- 
cgit v1.2.3-55-g7522