From 2f96c565af4eac619d9704963a200b6236154ac4 Mon Sep 17 00:00:00 2001 From: Lee Rowlands Date: Thu, 4 Jan 2024 07:48:27 +1000 Subject: [PATCH] Issue #3409525 by Wim Leers, Lee56, larowlan, cilefen, catch: Regression from #3341682: #states + #required do not automatically work together, resulting in an unsubmittable AccountSettingsForm --- core/modules/user/src/AccountSettingsForm.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/modules/user/src/AccountSettingsForm.php b/core/modules/user/src/AccountSettingsForm.php index 9f3d118fbcd..60ad0a6c917 100644 --- a/core/modules/user/src/AccountSettingsForm.php +++ b/core/modules/user/src/AccountSettingsForm.php @@ -305,7 +305,11 @@ class AccountSettingsForm extends ConfigFormBase { '#type' => 'textfield', '#title' => $this->t('Subject'), '#config_target' => 'user.mail:status_activated.subject', - '#required' => TRUE, + '#states' => [ + 'required' => [ + 'input[name="user_mail_status_activated_notify"]' => ['checked' => TRUE], + ], + ], '#maxlength' => 180, ]; $form['email_activated']['settings']['user_mail_status_activated_body'] = [ @@ -339,7 +343,11 @@ class AccountSettingsForm extends ConfigFormBase { '#type' => 'textfield', '#title' => $this->t('Subject'), '#config_target' => 'user.mail:status_blocked.subject', - '#required' => TRUE, + '#states' => [ + 'required' => [ + 'input[name="user_mail_status_blocked_notify"]' => ['checked' => TRUE], + ], + ], '#maxlength' => 180, ]; $form['email_blocked']['settings']['user_mail_status_blocked_body'] = [ @@ -393,7 +401,11 @@ class AccountSettingsForm extends ConfigFormBase { '#type' => 'textfield', '#title' => $this->t('Subject'), '#config_target' => 'user.mail:status_canceled.subject', - '#required' => TRUE, + '#states' => [ + 'required' => [ + 'input[name="user_mail_status_canceled_subject"]' => ['checked' => TRUE], + ], + ], '#maxlength' => 180, ]; $form['email_canceled']['settings']['user_mail_status_canceled_body'] = [