Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release 0.21.2 into 0.22.x #484

Merged
merged 4 commits into from
Jul 26, 2022
Merged

Merge release 0.21.2 into 0.22.x #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2ae503
fix bug: https://github.com/perftools/xhgui/issues/471
sunanzhi Jul 20, 2022
07d56e0
remove dead code
sunanzhi Jul 20, 2022
f2cbb74
fix compare.twig referencing a nonexistent value
sunanzhi Jul 25, 2022
597eecc
Merge pull request #481 from sunanzhi/0.21.x
glensc Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Controller/RunController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public function compare(Request $request): void
'base_run' => $baseRun,
'head_run' => $headRun,
'candidates' => $candidates,
'url_params' => $request->get(),
'url_params' => $request->getQueryParams(),
'comparison' => $comparison,
'paging' => $paging,
'search' => [
Expand Down
5 changes: 5 additions & 0 deletions src/RequestProxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ public function __construct(Request $request)
$this->request = $request;
}

public function getQueryParams()
{
return $this->request->getQueryParams();
}

public function get(string $key, $default = null)
{
return $this->request->getQueryParam($key, $default);
Expand Down
2 changes: 1 addition & 1 deletion templates/runs/compare.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div class="row-fluid row-spaced">
<h3>Other runs with {{ base_run.meta.simple_url }}</h3>
{% include 'runs/paginated-list.twig' with {runs: candidates.results, show_compare_link: true} %}
{{ helpers.pagination('run.compare', pagination, url_params) }}
{{ helpers.pagination('run.compare', paging, url_params) }}
</div>
{% endif %}

Expand Down