Verified Commit c4b10cbc authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3409525 by Wim Leers, Lee56, larowlan, cilefen, catch: Regression from... 

Issue #3409525 by Wim Leers, Lee56, larowlan, cilefen, catch: Regression from #3341682: #states + #required do not automatically work together, resulting in an unsubmittable AccountSettingsForm

(cherry picked from commit 2f96c565)
parent cb0a7995

core/modules/user/src/AccountSettingsForm.php

+15 −3
Original line number Diff line number Diff line
@@ -305,7 +305,11 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
      '#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 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
      '#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 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
      '#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'] = [