Verified Commit eb9a1025 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3427398 by aaron.ferris, alexpott, sdhruvi5142, rkoller, smustgrave,... 

Issue #3427398 by aaron.ferris, alexpott, sdhruvi5142, rkoller, smustgrave, DanielVeza: Cancel button on the discard changes in the layout builder confirmation step should take you back to the layout builder

(cherry picked from commit 8c50a65a)
parent e28809ff

core/modules/layout_builder/src/Form/DiscardLayoutChangesForm.php

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public function getQuestion() { 
   * {@inheritdoc}

   */

  public function getCancelUrl() {

    return $this->sectionStorage->getRedirectUrl();

    return $this->sectionStorage->getLayoutBuilderUrl();

  }



  /**
@@ -100,7 +100,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { 


    $this->messenger->addMessage($this->t('The changes to the layout have been discarded.'));



    $form_state->setRedirectUrl($this->getCancelUrl());

    $form_state->setRedirectUrl($this->sectionStorage->getRedirectUrl());

  }



}

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php

+8 −1
Original line number Diff line number Diff line
@@ -94,10 +94,17 @@ public function testUnsavedChangesMessage() { 
    $assert_session = $this->assertSession();

    $page = $this->getSession()->getPage();



    // Make and then discard changes.

    $this->assertModifiedLayout(static::FIELD_UI_PREFIX . '/display/default/layout');

    // Discard then cancel.

    $page->pressButton('Discard changes');

    $page->clickLink('Cancel');

    $assert_session->addressEquals(static::FIELD_UI_PREFIX . '/display/default/layout');

    $assert_session->pageTextContainsOnce('You have unsaved changes.');



    // Discard then confirm.

    $page->pressButton('Discard changes');

    $page->pressButton('Confirm');

    $assert_session->addressEquals(static::FIELD_UI_PREFIX . '/display/default');

    $assert_session->pageTextNotContains('You have unsaved changes.');



    // Make and then save changes.