Skip to content

[4.1] Form list with showon attributes should load the show on script #37300

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

Closed
dgrammatiko wants to merge 15 commits into from
Closed

[4.1] Form list with showon attributes should load the show on script #37300

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c399fe8
list-show-on
dgrammatiko Mar 16, 2022
cb41ce0
Update ListField.php
dgrammatiko Mar 17, 2022
ac8bed2
Update libraries/src/Form/Field/ListField.php
dgrammatiko Mar 17, 2022
6a7684e
Update list.php
dgrammatiko Mar 18, 2022
93b2068
Update ListField.php
dgrammatiko Mar 18, 2022
3f44437
Update list.php
dgrammatiko Mar 18, 2022
723f805
Update ListField.php
dgrammatiko Mar 18, 2022
284aa6c
Update FormField.php
dgrammatiko Mar 20, 2022
113a68f
Update ListField.php
dgrammatiko Mar 20, 2022
b761cf4
Update ListField.php
dgrammatiko Mar 20, 2022
281b1c9
Tiny perf
dgrammatiko Mar 20, 2022
32997d5
Update libraries/src/Form/FormField.php
dgrammatiko Mar 20, 2022
0677579
Merge branch '4.1-dev' into patch-17
dgrammatiko Mar 20, 2022
7b7a58d
Merge branch '4.1-dev' into patch-17
dgrammatiko Mar 22, 2022
79376e3
Merge branch '4.1-dev' into patch-17
dgrammatiko Apr 1, 2022
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
29 changes: 20 additions & 9 deletions libraries/src/Form/FormField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,17 +1316,12 @@ public function postProcess($value, $group = null, Registry $input = null)
*/
protected function getLayoutData()
{
// Label preprocess
$label = !empty($this->element['label']) ? (string) $this->element['label'] : null;
$label = $label && $this->translateLabel ? Text::_($label) : $label;

// Description preprocess
$label = !empty($this->element['label']) ? (string) $this->element['label'] : null;
$label = $label && $this->translateLabel ? Text::_($label) : $label;
$description = !empty($this->description) ? $this->description : null;
$description = !empty($description) && $this->translateDescription ? Text::_($description) : $description;

$alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname);

return [
$alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname);
$options = [
'autocomplete' => $this->autocomplete,
'autofocus' => $this->autofocus,
'class' => $this->class,
Expand Down Expand Up @@ -1356,6 +1351,22 @@ protected function getLayoutData()
'dataAttributes' => $this->dataAttributes,
'parentclass' => $this->parentclass,
];

// Enable showOn from nested options
if (!empty((array) $this->element->xpath('option')))
{
foreach ($this->element->xpath('option') as $option)
{
if ((string) $option['showon'])
{
$options['showonEnabled'] = true;

break;
}
}
}

return $options;
}

/**
Expand Down