diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php index 056c03e8a223efc1cda9d8ae025bbdcd0b9a1616..0f242a43ddd9e7d261b472d16b8410289b734527 100644 --- a/typo3/sysext/backend/Classes/View/PageLayoutView.php +++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php @@ -195,13 +195,6 @@ class PageLayoutView implements LoggerAwareInterface */ public $showLimit = 0; - /** - * Whether to show localization view or not - * - * @var bool - */ - public $localizationView = false; - /** * Shared module configuration, used by localization features * @@ -3034,11 +3027,7 @@ class PageLayoutView implements LoggerAwareInterface HttpUtility::redirect($returnUrl); } } - - // Initialize languages: - if ($this->localizationView) { - $this->initializeLanguages(); - } + $this->initializeLanguages(); } /** diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php index 99aeadf32b1f2c62c66406528f109a06949e71c4..6c8221791720c9212e8669cf17c3a3cef2dae369 100644 --- a/typo3/sysext/core/Configuration/DefaultConfiguration.php +++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php @@ -896,7 +896,6 @@ return [ 'defaultPageTSconfig' => ' mod.web_list.enableDisplayBigControlPanel=selectable mod.web_list.enableClipBoard=selectable - mod.web_list.enableLocalizationView=selectable mod.web_list.tableDisplayOrder { be_users.after = be_groups sys_filemounts.after = be_users diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82991-RecordListLocalizationViewIsAlwaysEnabled.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82991-RecordListLocalizationViewIsAlwaysEnabled.rst new file mode 100644 index 0000000000000000000000000000000000000000..600060a19f914cd2350242149800e36a2cda0058 --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82991-RecordListLocalizationViewIsAlwaysEnabled.rst @@ -0,0 +1,33 @@ +.. include:: ../../Includes.txt + +==================================================================== +Breaking: #82991 - Record list "Localization View" is always enabled +==================================================================== + +See :issue:`82991` + +Description +=========== + +The option / checkbox "Localization View" in TYPO3's List module was removed, as the functionality is now +always enabled. + + +Impact +====== + +The PageTSconfig option ``mod.web_list.enableLocalizationView`` has no effect anymore. + + +Affected Installations +====================== + +Any multi-language installation using the TSconfig option above to e.g. disable the localization view. + + +Migration +========= + +Remove the TSconfig option. + +.. index:: TSConfig, NotScanned \ No newline at end of file diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php index af2e41ef56f9c5fdce9a8f3f7cbc89f848ae3930..03422b72765391d050951ef6b5aea95697919ba1 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/Inline1nCest.php @@ -87,11 +87,11 @@ class Inline1nCest $I->click('a[title="Close"]'); $I->wait(3); - $I->executeJS('$(\'a[data-table="pages_language_overlay"] .icon-actions-view-list-collapse\').click();'); + $I->executeJS('$(\'a[data-table="pages"] .icon-actions-view-list-collapse\').click();'); $I->wait(1); $I->see('lipsum', '#recordlist-tx_styleguide_inline_1n_child > div:nth-child(1) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(1) > td:nth-child(2) > a'); - $I->see('Fo Bar', '#recordlist-tx_styleguide_inline_1n_child > div:nth-child(1) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(3) > td:nth-child(2) > a'); + $I->see('Fo Bar', '#recordlist-tx_styleguide_inline_1n_child > div:nth-child(1) > table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(5) > td:nth-child(2) > a'); } /** @@ -107,7 +107,7 @@ class Inline1nCest $I->click('a[title="Close"]'); $I->wait(3); - $I->executeJS('$(\'a[data-table="pages_language_overlay"] .icon-actions-view-list-collapse\').click();'); + $I->executeJS('$(\'a[data-table="pages"] .icon-actions-view-list-collapse\').click();'); $I->wait(1); $I->wantTo('Check new sorting'); diff --git a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php index 6f409e3198acb90dd0b4631ae47d3a9f5dce59d2..175f14ea5804588ba5bf82e195eb92271f18c461 100644 --- a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php +++ b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php @@ -238,7 +238,6 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn $dbList->setOverrideUrlParameters($this->getUrlParameters([])); $dbList->thisScript = $this->thisScript; $dbList->thumbs = false; - $dbList->localizationView = true; $dbList->setIsEditable(false); $dbList->calcPerms = $backendUser->calcPerms($pageInfo); $dbList->noControlPanels = true; diff --git a/typo3/sysext/recordlist/Classes/RecordList.php b/typo3/sysext/recordlist/Classes/RecordList.php index 85b77ff316cde6ad865737bd544ff5fa2a6ed947..246e6cded89cb310b9bb5d8567f311c4511797cf 100644 --- a/typo3/sysext/recordlist/Classes/RecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList.php @@ -248,7 +248,6 @@ class RecordList $this->MOD_MENU = [ 'bigControlPanel' => '', 'clipBoard' => '', - 'localization' => '' ]; // Loading module configuration: $this->modTSconfig = BackendUtility::getModTSconfig($this->id, 'mod.' . $this->moduleName); @@ -309,12 +308,6 @@ class RecordList $this->MOD_SETTINGS['clipBoard'] = true; } } - // Set predefined value for LocalizationView: - if ($this->modTSconfig['properties']['enableLocalizationView'] === 'activated') { - $this->MOD_SETTINGS['localization'] = true; - } elseif ($this->modTSconfig['properties']['enableLocalizationView'] === 'deactivated') { - $this->MOD_SETTINGS['localization'] = false; - } // Initialize the dblist object: /** @var $dblist RecordList\DatabaseRecordList */ @@ -324,7 +317,6 @@ class RecordList $dblist->thumbs = $backendUser->uc['thumbnailsByDefault']; $dblist->returnUrl = $this->returnUrl; $dblist->allFields = $this->MOD_SETTINGS['bigControlPanel'] || $this->table ? 1 : 0; - $dblist->localizationView = $this->MOD_SETTINGS['localization']; $dblist->showClipboard = 1; $dblist->disableSingleTableView = $this->modTSconfig['properties']['disableSingleTableView']; $dblist->listOnlyInSingleTableMode = $this->modTSconfig['properties']['listOnlyInSingleTableView']; @@ -336,7 +328,7 @@ class RecordList $dblist->newWizards = $this->modTSconfig['properties']['newWizards'] ? 1 : 0; $dblist->pageRow = $this->pageinfo; $dblist->counter++; - $dblist->MOD_MENU = ['bigControlPanel' => '', 'clipBoard' => '', 'localization' => '']; + $dblist->MOD_MENU = ['bigControlPanel' => '', 'clipBoard' => '']; $dblist->modTSconfig = $this->modTSconfig; $clickTitleMode = trim($this->modTSconfig['properties']['clickTitleMode']); $dblist->clickTitleMode = $clickTitleMode === '' ? 'edit' : $clickTitleMode; @@ -504,7 +496,7 @@ class RecordList $this->body .= ' <!-- - Listing options for extended view, clipboard and localization view + Listing options for extended view and clipboard view --> <div class="typo3-listOptions"> <form action="" method="post">'; @@ -531,16 +523,6 @@ class RecordList } } - // Add "localization view" checkbox: - if ($this->modTSconfig['properties']['enableLocalizationView'] === 'selectable') { - $this->body .= '<div class="checkbox">' . - '<label for="checkLocalization">' . - BackendUtility::getFuncCheck($this->id, 'SET[localization]', $this->MOD_SETTINGS['localization'], '', $this->table ? '&table=' . $this->table : '', 'id="checkLocalization"') . - BackendUtility::wrapInHelp('xMOD_csh_corebe', 'list_options', htmlspecialchars($lang->getLL('localization'))) . - '</label>' . - '</div>'; - } - $this->body .= ' </form> </div>'; diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php index 7d249d093625a04677f6483de657da2eb8bdec6b..7fb641de82b693a3689cfbf38de5e7a3e8d5832a 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php @@ -100,14 +100,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList */ public $allFields = 0; - /** - * Whether to show localization view or not - * - * @var bool - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10 - */ - public $localizationView = false; - /** * If set, csvList is outputted. * @@ -470,11 +462,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList HttpUtility::redirect($returnUrl); } } - - // Initialize languages: - if ($this->localizationView) { - $this->initializeLanguages(); - } + $this->initializeLanguages(); } /** diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php index f77fa8c2db2d2858c845f93173a4bce81f4f5c40..8330a7e2663bc975958ee9494ed59480ab4c2004 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php @@ -139,13 +139,6 @@ class DatabaseRecordList */ public $pageRow = []; - /** - * Whether to show localization view or not - * - * @var bool - */ - public $localizationView = false; - /** * Shared module configuration, used by localization features * @@ -943,7 +936,7 @@ class DatabaseRecordList $this->fieldArray[] = '_PATH_'; } // Localization - if ($this->localizationView && $l10nEnabled) { + if ($l10nEnabled) { $this->fieldArray[] = '_LOCALIZATION_'; $this->fieldArray[] = '_LOCALIZATION_b'; // Only restrict to the default language if no search request is in place @@ -1168,10 +1161,10 @@ class DatabaseRecordList $cc++; $this->translations = false; $rowOutput .= $this->renderListRow($table, $row, $cc, $titleCol, $thumbsCol); - // If localization view is enabled and no search happened it means that the selected + // If no search happened it means that the selected // records are either default or All language and here we will not select translations // which point to the main record: - if ($this->localizationView && $l10nEnabled && $this->searchString === '') { + if ($l10nEnabled && $this->searchString === '') { // For each available translation, render the record: if (is_array($this->translations)) { foreach ($this->translations as $lRow) { @@ -1850,7 +1843,7 @@ class DatabaseRecordList ]; // Enables to hide the move elements for localized records - doesn't make much sense to perform these options for them // For page translations these icons should never be shown - $isL10nOverlay = ($this->localizationView || $table === 'pages') && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; + $isL10nOverlay = $table === 'pages' && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; // If the listed table is 'pages' we have to request the permission settings for each page: $localCalcPerms = 0; if ($table === 'pages') { @@ -2161,7 +2154,7 @@ class DatabaseRecordList $cells['pasteAfter'] = ($cells['pasteInto'] = $this->spaceIcon); // Enables to hide the copy, cut and paste icons for localized records - doesn't make much sense to perform these options for them // For page translations these icons should never be shown - $isL10nOverlay = ($this->localizationView || $table === 'pages') && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; + $isL10nOverlay = $table === 'pages' && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; // Return blank, if disabled: // Whether a numeric clipboard pad is active or the normal pad we will see different content of the panel: // For the "Normal" pad: @@ -2854,11 +2847,7 @@ class DatabaseRecordList HttpUtility::redirect($returnUrl); } } - - // Initialize languages: - if ($this->localizationView) { - $this->initializeLanguages(); - } + $this->initializeLanguages(); } /** diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php index f771a0048a00171c5e59c9bd4bc56591f7e8ea6f..372590a2fdefc8af20f492cdcdf97535ebe225b5 100644 --- a/typo3/sysext/sys_action/Classes/ActionTask.php +++ b/typo3/sysext/sys_action/Classes/ActionTask.php @@ -899,12 +899,11 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface $dblist->thumbs = $this->getBackendUser()->uc['thumbnailsByDefault']; $dblist->returnUrl = $this->taskObject->returnUrl; $dblist->allFields = 1; - $dblist->localizationView = 1; $dblist->showClipboard = 0; $dblist->disableSingleTableView = 1; $dblist->pageRow = $this->pageinfo; $dblist->counter++; - $dblist->MOD_MENU = ['bigControlPanel' => '', 'clipBoard' => '', 'localization' => '']; + $dblist->MOD_MENU = ['bigControlPanel' => '', 'clipBoard' => '']; $dblist->modTSconfig = $this->taskObject->modTSconfig; $dblist->dontShowClipControlPanels = (!$this->taskObject->MOD_SETTINGS['bigControlPanel'] && $dblist->clipObj->current === 'normal' && !$this->modTSconfig['properties']['showClipControlPanelsDespiteOfCMlayers']); // Initialize the listing object, dblist, for rendering the list: