From b6991198d861994740f5372c892155b67e0a0b28 Mon Sep 17 00:00:00 2001 From: Caspar Stuebs <caspar@gosign.de> Date: Mon, 21 Oct 2013 16:46:35 +0200 Subject: [PATCH] [BUGFIX] Show labels of additional doktypes in new page drag area Get the labels for the doktypes from TCA Resolves: #52955 Releases: 6.2, 6.1 Change-Id: I6d70c11f1711bf191a4ce14a91796819224649da Reviewed-on: https://review.typo3.org/24934 Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters --- .../Pagetree/ExtdirectTreeDataProvider.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php index ab8c836f726f..7cf1797727ed 100644 --- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php +++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php @@ -118,16 +118,13 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre * @return array */ public function getNodeTypes() { - $map = array( - 1 => 'LLL:EXT:lang/locallang_tca.xlf:doktype.I.0', - 3 => 'LLL:EXT:cms/locallang_tca.xlf:pages.doktype.I.8', - 4 => 'LLL:EXT:cms/locallang_tca.xlf:pages.doktype.I.2', - 6 => 'LLL:EXT:cms/locallang_tca.xlf:pages.doktype.I.4', - 7 => 'LLL:EXT:cms/locallang_tca.xlf:pages.doktype.I.5', - 199 => 'LLL:EXT:cms/locallang_tca.xlf:pages.doktype.I.7', - 254 => 'LLL:EXT:lang/locallang_tca.xlf:doktype.I.folder', - 255 => 'LLL:EXT:lang/locallang_tca.xlf:doktype.I.2' - ); + $doktypeLabelMap = array(); + foreach ($GLOBALS['TCA']['pages']['columns']['doktype']['config']['items'] as $doktypeItemConfig) { + if ($doktypeItemConfig[1] === '--div--') { + continue; + } + $doktypeLabelMap[$doktypeItemConfig[1]] = $doktypeItemConfig[0]; + } $doktypes = GeneralUtility::trimExplode(',', $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.doktypesToShowInNewPageDragArea')); $output = array(); $allowedDoktypes = GeneralUtility::trimExplode(',', $GLOBALS['BE_USER']->groupData['pagetypes_select']); @@ -136,7 +133,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre if (!$isAdmin && !in_array($doktype, $allowedDoktypes)) { continue; } - $label = $GLOBALS['LANG']->sL($map[$doktype], TRUE); + $label = $GLOBALS['LANG']->sL($doktypeLabelMap[$doktype], TRUE); $spriteIcon = IconUtility::getSpriteIconClasses($GLOBALS['TCA']['pages']['ctrl']['typeicon_classes'][$doktype]); $output[] = array( 'nodeType' => $doktype, -- GitLab