Skip to content

Commit

Permalink
[BUGFIX] Only apply language constraints for "Show hidden" checkbox i…
Browse files Browse the repository at this point in the history 
…f neccessary

The checkbox "Show hidden content elements" currently checks any selected
language. This is malfunctioning in case the language "Default" is
selected in the "Language" view, as it won't affect any translation.

The patch now changes the handling to add the language constraint only if
the view renders multiple languages and any language is selected, that is
not the default language.

Resolves: #84589
Resolves: #84573
Releases: master, 8.7
Change-Id: I572d594e5828d423e67a40481f44857df79ebae9
Reviewed-on: https://review.typo3.org/56532
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Sybille Peters <sypets@gmx.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Joshua Westerheide <account@jdoubleu.de>
Tested-by: Joshua Westerheide <account@jdoubleu.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
  • Loading branch information
@andreaskienast
andreaskienast committed Apr 6, 2018
1 parent b6fbbfc commit 94acfea
Showing 1 changed file with 32 additions and 16 deletions.
48 changes: 32 additions & 16 deletions typo3/sysext/backend/Classes/Controller/PageLayoutController.php
View file
Expand Up @@ -386,8 +386,9 @@ public function menuConfig()
// Clean up settings
$this->MOD_SETTINGS = BackendUtility::getModuleData($this->MOD_MENU, GeneralUtility::_GP('SET'), $this->moduleName);
// For all elements to be shown in draft workspaces & to also show hidden elements by default if user hasn't disabled the option
if ($this->getBackendUser()->workspace != 0 ||
isset($this->MOD_SETTINGS['tt_content_showHidden']) && $this->MOD_SETTINGS['tt_content_showHidden'] !== '0'
if ($this->getBackendUser()->workspace != 0
|| !isset($this->MOD_SETTINGS['tt_content_showHidden'])
|| $this->MOD_SETTINGS['tt_content_showHidden'] !== '0'
) {
$this->MOD_SETTINGS['tt_content_showHidden'] = 1;
}
Expand Down Expand Up @@ -843,18 +844,6 @@ public function renderContent()
$h_func = '';
$h_func_b = '';
if (!isset($dbList->externalTables[$table])) {
// Toggle hidden ContentElements
$numberOfHiddenElements = $this->getNumberOfHiddenElements();
if ($numberOfHiddenElements > 0) {
$h_func_b = '
<div class="checkbox">
<label for="checkTt_content_showHidden">
<input type="checkbox" id="checkTt_content_showHidden" class="checkbox" name="SET[tt_content_showHidden]" value="1" ' . ($this->MOD_SETTINGS['tt_content_showHidden'] ? 'checked="checked"' : '') . ' />
' . htmlspecialchars($this->getLanguageService()->getLL('hiddenCE')) . ' (<span class="t3js-hidden-counter">' . $numberOfHiddenElements . '</span>)
</label>
</div>';
}

// Boolean: Display up/down arrows and edit icons for tt_content records
$dbList->tt_contentConfig['showCommands'] = 1;
// Boolean: Display info-marks or not
Expand Down Expand Up @@ -884,6 +873,17 @@ public function renderContent()
$dbList->tt_contentConfig['languageCols'] = $this->MOD_MENU['language'];
$dbList->tt_contentConfig['languageColsPointer'] = $this->current_sys_language;
}
// Toggle hidden ContentElements
$numberOfHiddenElements = $this->getNumberOfHiddenElements($dbList->tt_contentConfig);
if ($numberOfHiddenElements > 0) {
$h_func_b = '
<div class="checkbox">
<label for="checkTt_content_showHidden">
<input type="checkbox" id="checkTt_content_showHidden" class="checkbox" name="SET[tt_content_showHidden]" value="1" ' . ($this->MOD_SETTINGS['tt_content_showHidden'] ? 'checked="checked"' : '') . ' />
' . htmlspecialchars($this->getLanguageService()->getLL('hiddenCE')) . ' (<span class="t3js-hidden-counter">' . $numberOfHiddenElements . '</span>)
</label>
</div>';
}
} else {
if (isset($this->MOD_SETTINGS) && isset($this->MOD_MENU)) {
$h_func = BackendUtility::getFuncMenu($this->id, 'SET[' . $table . ']', $this->MOD_SETTINGS[$table], $this->MOD_MENU[$table], '', '');
Expand Down Expand Up @@ -1073,9 +1073,10 @@ protected function makeButtons()
* Returns the number of hidden elements (including those hidden by start/end times)
* on the current page (for the current sys_language)
*
* @param array $contentConfig
* @return int
*/
public function getNumberOfHiddenElements()
public function getNumberOfHiddenElements(array $contentConfig = [])
{
/** @var QueryBuilder $queryBuilder */
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
Expand All @@ -1091,12 +1092,27 @@ public function getNumberOfHiddenElements()
$queryBuilder->expr()->eq(
'pid',
$queryBuilder->createNamedParameter($this->id, \PDO::PARAM_INT)
),
)
);

if (!empty($contentConfig['languageCols']) && is_array($contentConfig['languageCols'])) {
// Multi-language view is active
if ($this->current_sys_language > 0) {
$queryBuilder->andWhere(
$queryBuilder->expr()->in(
'sys_language_uid',
[0, $queryBuilder->createNamedParameter($this->current_sys_language, \PDO::PARAM_INT)]
)
);
}
} else {
$queryBuilder->andWhere(
$queryBuilder->expr()->eq(
'sys_language_uid',
$queryBuilder->createNamedParameter($this->current_sys_language, \PDO::PARAM_INT)
)
);
}

if (!empty($GLOBALS['TCA']['tt_content']['ctrl']['enablecolumns']['disabled'])) {
$andWhere[] = $queryBuilder->expr()->neq(
Expand Down

0 comments on commit 94acfea

Please sign in to comment.