From 56aec5f43b94b6d13986824503ea7645c7fdbdd4 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sun, 20 Aug 2017 10:43:10 +0200
Subject: [PATCH] [BUGFIX] Install tool: Empty messages in TCA migration
The JsonView should return the detail message text as
'message' array and not as 'status'.
Change-Id: I492d31ee8fe3895c97e0229369c5f3ca09f7b713
Resolves: #82137
Related: #76084
Releases: master
Reviewed-on: https://review.typo3.org/53742
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Mona Muzaffar <mona.muzaffar@gmx.de>
Reviewed-by: Sascha Egerer <sascha@sascha-egerer.de>
Reviewed-by: Jan Stockfisch <jan.stockfisch@googlemail.com>
Tested-by: Jan Stockfisch <jan.stockfisch@googlemail.com>
Reviewed-by: Joerg Boesche <typo3@joergboesche.de>
Tested-by: Joerg Boesche <typo3@joergboesche.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
typo3/sysext/install/Classes/Status/AbstractStatus.php | 2 +-
.../install/Resources/Public/JavaScript/Modules/Presets.js | 2 +-
typo3/sysext/install/Tests/Unit/Status/AbstractStatusTest.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/install/Classes/Status/AbstractStatus.php b/typo3/sysext/install/Classes/Status/AbstractStatus.php
index 15586bec19c0..4fc971dcdf60 100644
--- a/typo3/sysext/install/Classes/Status/AbstractStatus.php
+++ b/typo3/sysext/install/Classes/Status/AbstractStatus.php
@@ -110,7 +110,7 @@ abstract class AbstractStatus implements StatusInterface
return [
'severity' => $this->getSeverityNumber(),
'title' => $this->getTitle(),
- 'status' => $this->getMessage()
+ 'message' => $this->getMessage(),
];
}
diff --git a/typo3/sysext/install/Resources/Public/JavaScript/Modules/Presets.js b/typo3/sysext/install/Resources/Public/JavaScript/Modules/Presets.js
index f1ec0a66a689..64befb3cbe7a 100644
--- a/typo3/sysext/install/Resources/Public/JavaScript/Modules/Presets.js
+++ b/typo3/sysext/install/Resources/Public/JavaScript/Modules/Presets.js
@@ -64,7 +64,7 @@ define(['jquery', 'TYPO3/CMS/Install/FlashMessage', 'TYPO3/CMS/Install/ProgressB
$outputContainer.empty();
if (data.success === true && Array.isArray(data.status)) {
data.status.forEach(function(element) {
- var message = InfoBox.render(element.severity, element.title, element.status);
+ var message = InfoBox.render(element.severity, element.title, element.message);
$outputContainer.append(message);
});
}
diff --git a/typo3/sysext/install/Tests/Unit/Status/AbstractStatusTest.php b/typo3/sysext/install/Tests/Unit/Status/AbstractStatusTest.php
index 41cca3951e1a..7c9f0f4a38cf 100644
--- a/typo3/sysext/install/Tests/Unit/Status/AbstractStatusTest.php
+++ b/typo3/sysext/install/Tests/Unit/Status/AbstractStatusTest.php
@@ -43,7 +43,7 @@ class AbstractStatusTest extends UnitTestCase
$expected = [
'severity' => 1,
'title' => 'aTitle',
- 'status' => 'aMessage',
+ 'message' => 'aMessage',
];
$this->assertEquals($expected, $status->jsonSerialize());
}
--
GitLab