Commit f6711c01 authored by davidwhthomas's avatar davidwhthomas Committed by Steven Jones
Browse files

[#3485587] fix: Error on redirect to display that uses contextual filters and route parameters

By: davidwhthomas
By: steven jones
By: christian.wiedemann
By: divyat
parent 3b00c840
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -239,15 +239,15 @@ class DataExport extends RestExport {
      }
    }
    elseif (isset($redirect_to_display) && $redirect_to_display !== 'none') {
      // Get views display URL.
      $display_route = $view->getUrl([], $redirect_to_display)
        ->getRouteName();

      // Get views display URL, including route parameters.
      $view_url = $view->getUrl($view->args, $redirect_to_display);
      $display_route = $view_url->getRouteName();
      $display_route_parameters = $view_url->getRouteParameters();
      if ($include_query_params) {
        $redirect_url = Url::fromRoute($display_route, [], ['query' => $query_parameters]);
        $redirect_url = Url::fromRoute($display_route, $display_route_parameters, ['query' => $query_parameters]);
      }
      else {
        $redirect_url = Url::fromRoute($display_route);
        $redirect_url = Url::fromRoute($display_route, $display_route_parameters);
      }
    }
    return $redirect_url->toString();