Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 8c50a65a7d)
merge-requests/7413/head
Alex Pott 2024-04-06 12:48:31 +01:00
parent ee650b2e7f
commit 828a3c56df
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/layout_builder/src/Form/DiscardLayoutChangesForm.php
View File

@ -79,7 +79,7 @@ class DiscardLayoutChangesForm extends ConfirmFormBase {
* {@inheritdoc}
*/
public function getCancelUrl() {
return $this->sectionStorage->getRedirectUrl();
return $this->sectionStorage->getLayoutBuilderUrl();
}
/**
@ -100,7 +100,7 @@ class DiscardLayoutChangesForm extends ConfirmFormBase {
$this->messenger->addMessage($this->t('The changes to the layout have been discarded.'));
$form_state->setRedirectUrl($this->getCancelUrl());
$form_state->setRedirectUrl($this->sectionStorage->getRedirectUrl());
}
}

9
core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php
View File

@ -94,10 +94,17 @@ class LayoutBuilderUiTest extends WebDriverTestBase {
$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.