Skip to content

Update panel state of DataContainer when custom filters are active #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fritzmg merged 4 commits into from
Jan 30, 2026
Merged

Update panel state of DataContainer when custom filters are active #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
659f9f2
Update panel state of DataContainer when custom filters are active
fritzmg Jan 29, 2026
c42065b
Check if method exists and auto submit
fritzmg Jan 29, 2026
cca885e
ignore PHP Stan
fritzmg Jan 29, 2026
ed3d0b9
Add Choices support for relation filter
fritzmg Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/DcaRelationsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,8 @@ public function addRelationFilters(DataContainer $dc): string
return '';
}

/** @phpstan-ignore function.alreadyNarrowedType */
$updatePanelState = method_exists($dc, 'setPanelState');
$filter = ($GLOBALS['TL_DCA'][$dc->table]['list']['sorting']['mode'] ?? null) === DataContainer::MODE_PARENT ? $dc->table.'_'.$dc->currentPid : $dc->table;

/** @var AttributeBagInterface $session */
Expand All @@ -589,7 +591,11 @@ public function addRelationFilters(DataContainer $dc): string
<strong>'.$GLOBALS['TL_LANG']['HST']['advanced_filter'].'</strong> ';

foreach ($this->filterableFields[$dc->table] as $field => $relation) {
$return .= '<select name="'.$field.'" class="tl_select tl_chosen'.(isset($session['filter'][$filter][$field]) ? ' active' : '').'">
if ($updatePanelState) {
$return .= '<div class="tl_select_wrapper" data-controller="contao--choices">';
}

$return .= '<select name="'.$field.'" class="tl_select tl_chosen'.(isset($session['filter'][$filter][$field]) ? ' active' : '').'"'.($updatePanelState ? ' onchange="this.form.requestSubmit()"' : '').'>
<option value="tl_'.$field.'">'.($GLOBALS['TL_DCA'][$dc->table]['fields'][$field]['label'][0] ?? '').'</option>
<option value="tl_'.$field.'">---</option>';

Expand Down Expand Up @@ -662,12 +668,22 @@ public function addRelationFilters(DataContainer $dc): string
$option_label = $vv ?: '-';
}

$options_sorter[' <option value="'.StringUtil::specialchars($value).'"'.(isset($session['filter'][$filter][$field]) && (string) $value === (string) $session['filter'][$filter][$field] ? ' selected="selected"' : '').'>'.$option_label.'</option>'] = (new UnicodeString((string) $option_label))->ascii()->toString();
$selected = isset($session['filter'][$filter][$field]) && (string) $value === (string) $session['filter'][$filter][$field];

if ($selected && $updatePanelState) {
$dc->setPanelState(true);
}

$options_sorter[' <option value="'.StringUtil::specialchars($value).'"'.($selected ? ' selected="selected"' : '').'>'.$option_label.'</option>'] = (new UnicodeString((string) $option_label))->ascii()->toString();
}

$return .= "\n".implode("\n", array_keys($options_sorter));
$return .= '</select> ';

if ($updatePanelState) {
$return .= '</div>';
}

// Add the line-break after 5 elements
if (0 === ++$count % 5) {
$return .= '<br>';
Expand All @@ -686,6 +702,8 @@ public function addRelationSearch(DataContainer $dc): string
return '';
}

/** @phpstan-ignore function.alreadyNarrowedType */
$updatePanelState = method_exists($dc, 'setPanelState');
$return = '<div class="tl_filter tl_subpanel">';

/** @var AttributeBagInterface $session */
Expand Down Expand Up @@ -751,7 +769,11 @@ public function addRelationSearch(DataContainer $dc): string
uksort($options_sorter, strnatcasecmp(...));
$active = $sessionValues[$dc->table]['searchValue'] && $sessionValues[$dc->table]['table'] === $relTable;

$return .= '<select name="tl_field_'.$field.'" class="tl_select tl_chosen'.($active ? ' active' : '').'">
if ($active && $updatePanelState) {
$dc->setPanelState(true);
}

$return .= '<select name="tl_field_'.$field.'" class="tl_select tl_chosen'.($active ? ' active' : '').'"'.($updatePanelState ? ' onchange="this.form.requestSubmit()"' : '').'>
'.implode("\n", $options_sorter).'
</select>
<span>=</span>
Expand Down
6 changes: 6 additions & 0 deletions src/EventListener/DcaDateRangeFilterListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public function onPanelCallback(DataContainer $dc): string
return '';
}

/** @phpstan-ignore function.alreadyNarrowedType */
$updatePanelState = method_exists($dc, 'setPanelState');
$filter = ($GLOBALS['TL_DCA'][$dc->table]['list']['sorting']['mode'] ?? null) === DataContainer::MODE_PARENT ? $dc->table.'_'.$dc->currentPid : $dc->table;

/** @var AttributeBagInterface $session */
Expand Down Expand Up @@ -114,6 +116,10 @@ public function onPanelCallback(DataContainer $dc): string

$GLOBALS['TL_CSS'][] = System::getContainer()->get('assets.packages')->getUrl('dca-date-range-filter.css', 'codefog_haste');

if ($updatePanelState && isset($sessionData['filter'][$filter][$key])) {
$dc->setPanelState(true);
}

return $return;
}

Expand Down