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

Issue #3366287 by lauriii, catch, dmurphy1: [regression] Inserting media via the media library modal when paged redirects to the wrong destination

merge-requests/4290/head
Lee Rowlands 2023-06-14 09:02:44 +10:00
parent 3b6179f198
commit d5740e4ba1
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
View File

@ -45,7 +45,7 @@ class AjaxResponseSubscriber implements EventSubscriberInterface {
*/
public function onRequest(RequestEvent $event) {
// Pass to the Html class that the current request is an Ajax request.
if ($event->getRequest()->request->get(static::AJAX_REQUEST_PARAMETER)) {
if ($event->getRequest()->get(static::AJAX_REQUEST_PARAMETER)) {
Html::setIsAjax(TRUE);
}
}

13
core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php
View File

@ -98,6 +98,13 @@ class WidgetViewsTest extends MediaLibraryTestBase {
$this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(1)', 'Page 1');
$this->assertCount(24, $this->getCheckboxes());
$page->checkField('Select Bear');
$this->pressInsertSelected('Added one media item.');
$assert_session->pageTextContains('Bear');
$assert_session->pageTextNotContains('Cat');
$assert_session->pageTextNotContains('Turtle');
$this->openMediaLibraryForField('field_unlimited_media');
$this->switchToMediaLibraryTable();
// Assert the 'Apply filter' button is not moved to the button pane.
@ -111,7 +118,7 @@ class WidgetViewsTest extends MediaLibraryTestBase {
$page->fillField('Name', 'Dog');
$page->pressButton('Apply filters');
$this->waitForText('Dog');
$this->waitForNoText('Bear');
$this->waitForNoText('Crocodile');
$assert_session->pageTextNotContains('Turtle');
$page->checkField('Select Dog');
$assert_session->linkExists('Table');
@ -120,7 +127,7 @@ class WidgetViewsTest extends MediaLibraryTestBase {
// Assert the exposed filters are persisted when changing display.
$this->assertSame('Dog', $page->findField('Name')->getValue());
$assert_session->pageTextContains('Dog');
$assert_session->pageTextNotContains('Bear');
$assert_session->pageTextNotContains('Crocodile');
$assert_session->pageTextNotContains('Turtle');
$assert_session->linkExists('Grid');
$this->switchToMediaLibraryTable();
@ -129,7 +136,7 @@ class WidgetViewsTest extends MediaLibraryTestBase {
$this->pressInsertSelected('Added one media item.');
// Ensure that the selection completed successfully.
$assert_session->pageTextContains('Dog');
$assert_session->pageTextNotContains('Bear');
$assert_session->pageTextContains('Bear');
$assert_session->pageTextNotContains('Turtle');
}