From 1582ef11a6183ccaf0094aa4981f392f3ddf1fe9 Mon Sep 17 00:00:00 2001
From: Philipp Gampe <philipp.gampe@typo3.org>
Date: Tue, 7 Feb 2017 12:49:24 +0100
Subject: [PATCH] [BUGFIX] Remove checked items from Upgrade Analysis
Ignored files require the full path to a file for resurrection,
not just the headline.
Resolves: #79659
Releaes: master
Change-Id: I7f4ea9a0b2080c71dcd7d708c1c0ffccb30f15be
Reviewed-on: https://review.typo3.org/51562
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Classes/Controller/Action/Ajax/FilterManager.php | 2 +-
.../Private/Templates/Action/Ajax/FilterManager.html | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/FilterManager.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/FilterManager.php
index c78d88652cfa..2ad92ba73d94 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/FilterManager.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/FilterManager.php
@@ -37,7 +37,7 @@ class FilterManager extends AbstractAjaxAction
$files = [];
foreach ($ignoredFiles as $filePath) {
$file = current($documentationFileService->getListEntry($filePath));
- $files[] = $file['headline'];
+ $files[$file['headline']] = $file['filepath'];
}
$this->view->assign('files', $files);
return $this->view->render();
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Ajax/FilterManager.html b/typo3/sysext/install/Resources/Private/Templates/Action/Ajax/FilterManager.html
index c473a6bcbd30..e2a7bb5badbd 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Ajax/FilterManager.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Ajax/FilterManager.html
@@ -1,14 +1,14 @@
<div class="t3js-response">
- <f:for each="{files}" as="file">
+ <f:for each="{files}" as="filepath" key="headline">
<div class="panel-group" role="tablist" aria-multiselectable="false">
<div class="panel panel-default">
<div class="panel-heading" role="tab">
- <input type="checkbox" class="t3js-upgradeanalysis-restore pull-left" data-filepath="{file}"
+ <input type="checkbox" class="t3js-upgradeanalysis-restore pull-left" data-filepath="{filepath}"
title="restore this document"/>
<h3 class="panel-title">
<strong>
- {file}</strong>
+ {headline}</strong>
</h3>
</div>
</div>
--
GitLab