Unverified Commit 5ca9f5d8 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #2738547 by smustgrave, mehul.gada, lauriii, sahil.goyal, larowlan,... 

Issue #2738547 by smustgrave, mehul.gada, lauriii, sahil.goyal, larowlan, BarisW, xjm: Contextual Links do not respect parameters in the destination
parent 7c9a05d8

core/modules/contextual/js/contextual.es6.js

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 


    // Set the destination parameter on each of the contextual links.

    const destination = `destination=${Drupal.encodePath(

      Drupal.url(drupalSettings.path.currentPath),

      Drupal.url(drupalSettings.path.currentPath + window.location.search),

    )}`;

    $contextual.find('.contextual-links a').each(function () {

      const url = this.getAttribute('href');

core/modules/contextual/js/contextual.js

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
    var $region = $contextual.closest('.contextual-region');

    var contextual = Drupal.contextual;

    $contextual.html(html).addClass('contextual').prepend(Drupal.theme('contextualTrigger'));

    var destination = "destination=".concat(Drupal.encodePath(Drupal.url(drupalSettings.path.currentPath)));

    var destination = "destination=".concat(Drupal.encodePath(Drupal.url(drupalSettings.path.currentPath + window.location.search)));

    $contextual.find('.contextual-links a').each(function () {

      var url = this.getAttribute('href');

      var glue = url.indexOf('?') === -1 ? '?' : '&';

core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php

+17 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\contextual\FunctionalJavascript;



use Drupal\Core\Url;

use Drupal\FunctionalJavascriptTests\WebDriverTestBase;

use Drupal\user\Entity\Role;
@@ -114,4 +115,20 @@ public function testContextualLinksDestination() { 
    $this->assertEquals("destination=$expected_destination_value", $contextual_link_url_parsed['query']);

  }



  /**

   * Tests the contextual links destination with query.

   */

  public function testContextualLinksDestinationWithQuery() {

    $this->grantPermissions(Role::load(Role::AUTHENTICATED_ID), [

      'access contextual links',

      'administer blocks',

    ]);



    $this->drupalGet('admin/structure/block', ['query' => ['foo' => 'bar']]);

    $this->assertSession()->waitForElement('css', '.contextual button');

    $expected_destination_value = Url::fromRoute('block.admin_display')->toString();

    $contextual_link_url_parsed = parse_url($this->getSession()->getPage()->findLink('Configure block')->getAttribute('href'));

    $this->assertEquals("destination=$expected_destination_value%3Ffoo%3Dbar", $contextual_link_url_parsed['query']);

  }



}