Skip to content
Snippets Groups Projects
Commit c31677a7 authored by christian.wiedemann's avatar christian.wiedemann
Browse files

Merge branch '3518099-2.0.x-switching-displays' into '2.0.x'

Add subkey

See merge request !368
parents 34087d3f be1a4f4c
No related branches found
No related tags found
No related merge requests found
Pipeline #473645 passed
...@@ -108,7 +108,7 @@ class UiPComponentFormDisplaysForm extends ComponentForm { ...@@ -108,7 +108,7 @@ class UiPComponentFormDisplaysForm extends ComponentForm {
], ],
]; ];
if ($display_id === '_component_form') { if ($display_id === '_component_form') {
$element["display"]['value'] = [ $element["display"]['value_' . $display_id] = [
'#type' => 'component_form', '#type' => 'component_form',
'#allow_override' => TRUE, '#allow_override' => TRUE,
'#component_id' => $component_id, '#component_id' => $component_id,
...@@ -127,7 +127,7 @@ class UiPComponentFormDisplaysForm extends ComponentForm { ...@@ -127,7 +127,7 @@ class UiPComponentFormDisplaysForm extends ComponentForm {
]; ];
} }
elseif ($display_id) { elseif ($display_id) {
$element["display"]['value'] = [ $element["display"]['value_' . $display_id] = [
'#type' => 'uip_display_form', '#type' => 'uip_display_form',
'#display_id' => $display_id, '#display_id' => $display_id,
'#component_id' => $component_id, '#component_id' => $component_id,
...@@ -185,8 +185,9 @@ class UiPComponentFormDisplaysForm extends ComponentForm { ...@@ -185,8 +185,9 @@ class UiPComponentFormDisplaysForm extends ComponentForm {
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function elementValidate(array &$element, FormStateInterface $form_state): void { public static function elementValidate(array &$element, FormStateInterface $form_state): void {
if (isset($element['display']['value']['#value'])) { $display_id = $element['display']['display_id']['#value'];
$element['#value'] = $element['display']['value']['#value']; if (isset($element['display']['value_' . $display_id]['#value'])) {
$element['#value'] = $element['display']['value_' . $display_id]['#value'];
if (isset($element['display']['display_id']) if (isset($element['display']['display_id'])
&& $element['display']['display_id']['#value'] !== '_component_form') { && $element['display']['display_id']['#value'] !== '_component_form') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment