Skip to content

Commit 45f70b0

Browse files
OaphiOaphi
committed
switched all usages of request.params.merge to query_url helper
1 parent b35be1b commit 45f70b0

8 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎app/views/admin/_error_report.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<% if report.version? %>
2929
<br/>
3030
<strong>Version:</strong>
31-
<%= link_to report.version, request.params.merge(version: report.version) %>
31+
<%= link_to report.version, query_url(version: report.version) %>
3232
<% end %>
3333
</p>
3434

‎app/views/admin/audit_log.html.erb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535

3636
<div class="button-list is-gutterless">
3737
<% classes = 'button is-outlined is-muted' %>
38-
<%= link_to t('g.age'), request.params.merge(sort: 'age'),
38+
<%= link_to t('g.age'), query_url(sort: 'age'),
3939
class: "#{classes} #{params[:sort] == 'age' || params[:sort].nil? ? 'is-active' : ''}" %>
40-
<%= link_to t('g.type'), request.params.merge(sort: 'type'),
40+
<%= link_to t('g.type'), query_url(sort: 'type'),
4141
class: "#{classes} #{params[:sort] == 'type' ? 'is-active' : ''}" %>
42-
<%= link_to t('g.event'), request.params.merge(sort: 'event'),
42+
<%= link_to t('g.event'), query_url(sort: 'event'),
4343
class: "#{classes} #{params[:sort] == 'event' ? 'is-active' : ''}" %>
44-
<%= link_to t('g.related'), request.params.merge(sort: 'related'),
44+
<%= link_to t('g.related'), query_url(sort: 'related'),
4545
class: "#{classes} #{params[:sort] == 'related' ? 'is-active' : ''}" %>
46-
<%= link_to t('g.user'), request.params.merge(sort: 'user'),
46+
<%= link_to t('g.user'), query_url(sort: 'user'),
4747
class: "#{classes} #{params[:sort] == 'user' ? 'is-active' : ''}" %>
4848
</div>
4949
</div>

‎app/views/categories/show.html.erb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@
2626
</span>
2727

2828
<div class="button-list is-gutterless has-margin-2">
29-
<%= link_to 'Activity', request.params.merge(sort: 'activity'),
29+
<%= link_to 'Activity', query_url(sort: 'activity'),
3030
class: "button is-muted is-outlined #{(params[:sort].nil?) && !current_page?(questions_lottery_path) ||
3131
params[:sort] == 'activity' ? 'is-active' : ''}",
3232
title: 'most recent changes: new posts, edits, close/open, delete/undelete' %>
33-
<%= link_to 'Age', request.params.merge(sort: 'age'),
33+
<%= link_to 'Age', query_url(sort: 'age'),
3434
class: "button is-muted is-outlined #{params[:sort] == 'age' ? 'is-active' : ''}",
3535
title: 'newest posts (ignores other activity)' %>
36-
<%= link_to 'Score', request.params.merge(sort: 'score'),
36+
<%= link_to 'Score', query_url(sort: 'score'),
3737
class: "button is-muted is-outlined #{params[:sort] == 'score' ? 'is-active' : ''}",
3838
title: 'highest score first (not the same as net votes)' %>
3939
<% if SiteSetting['AllowContentTransfer'] %>
40-
<%= link_to 'Native', request.params.merge(sort: 'native'),
40+
<%= link_to 'Native', query_url(sort: 'native'),
4141
class: "button is-muted is-outlined #{params[:sort] == 'native' ? 'is-active' : ''}",
4242
title: 'exclude imported posts' %>
4343
<% end %>
44-
<%= link_to 'Random', request.params.merge(sort: 'lottery'),
44+
<%= link_to 'Random', query_url(sort: 'lottery'),
4545
class: "button is-muted is-outlined #{params[:sort] == 'lottery' ? 'is-active' : ''}",
4646
title: 'random set of questions, usually older ones' %>
4747
</div>

‎app/views/posts/show.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
<% end %>
2828
<% if num_answers > 1 %>
2929
<div class="button-list is-gutterless has-float-right">
30-
<%= link_to 'Score', request.params.merge(sort: 'score'),
30+
<%= link_to 'Score', query_url(sort: 'score'),
3131
class: "button is-muted is-outlined #{params[:sort].nil? || params[:sort] == 'score' ? 'is-active' : ''}",
3232
title: 'highest score first (not the same as net votes)' %>
33-
<%= link_to 'Active', request.params.merge(sort: 'active'),
33+
<%= link_to 'Active', query_url(sort: 'active'),
3434
class: "button is-muted is-outlined #{params[:sort] == 'active' ? 'is-active' : ''}",
3535
title: 'most recent changes first: new answers, edits, delete/undelete' %>
36-
<%= link_to 'Age', request.params.merge(sort: 'age'),
36+
<%= link_to 'Age', query_url(sort: 'age'),
3737
class: "button is-muted is-outlined #{params[:sort] == 'age' ? 'is-active' : ''}",
3838
title: 'newest posts first (ignores other activity)' %>
3939
</div>

‎app/views/search/search.html.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
</span>
1515
<div class="search-sorting-types button-list is-gutterless">
1616
<%= link_to 'Relevance',
17-
request.params.merge(sort: 'relevance'),
17+
query_url(sort: 'relevance'),
1818
class: "button is-outlined is-muted #{'is-active' if params[:sort] == 'relevance' || params[:sort].nil?}",
1919
role: 'button', 'aria-label': 'Sort by relevance' %>
2020
<%= link_to 'Activity',
21-
request.params.merge(sort: 'activity'),
21+
query_url(sort: 'activity'),
2222
class: "button is-outlined is-muted #{'is-active' if params[:sort] == 'activity'}",
2323
role: 'button', 'aria-label': 'Sort by activity' %>
2424
<%= link_to 'Age',
25-
request.params.merge(sort: 'age'),
25+
query_url(sort: 'age'),
2626
class: "button is-outlined is-muted #{'is-active' if params[:sort] == 'age'}",
2727
role: 'button', 'aria-label': 'Sort by age' %>
2828
<%= link_to 'Score',
29-
request.params.merge(sort: 'score'),
29+
query_url(sort: 'score'),
3030
class: "button is-outlined is-muted #{'is-active' if params[:sort] == 'score'}",
3131
role: 'button', 'aria-label': 'Sort by score' %>
3232
</div>

‎app/views/shared/_sorting.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<% type = option.is_a?(String) ? option : option[:type] %>
2121
<% title = "Sort by #{option.is_a?(String) ? option.humanize.downcase : option[:title]}" %>
2222
<% is_active = params[:sort] == type || (params[:sort].nil? && default_type.to_s == type) %>
23-
<%= link_to request.params.merge(sort: type, order: is_active ? reverse_order : nil),
23+
<%= link_to query_url(sort: type, order: is_active ? reverse_order : nil),
2424
class: "button is-muted is-outlined #{'is-active' if is_active}",
2525
role: 'button',
2626
title: title,

‎app/views/users/index.html.erb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
<%= text_field_tag :search, params[:search], class: 'form-element' %>
1010
<%= hidden_field_tag :sort, params[:sort] || @sort_param %>
1111
</div>
12-
<div class="actions has-padding-bottom-1">
12+
<div class="actions">
1313
<button type="submit" class="button is-filled is-medium"><i class="fas fa-search"></i><span class="sr-only">Search</span></button>
1414
</div>
1515
</div>
1616
<% end %>
1717

1818
<div class="button-list is-gutterless has-margin-bottom-4">
19-
<%= link_to 'Reputation', request.params.merge(sort: 'reputation'),
19+
<%= link_to 'Reputation', query_url(sort: 'reputation'),
2020
class: "button is-muted is-outlined #{params[:sort] == 'reputation' || (params[:sort].nil? && params[:search].nil?) ? 'is-active' : ''}",
2121
role: 'button', 'aria-label': 'Sort by reputation' %>
22-
<%= link_to 'Age', request.params.merge(sort: 'age'), class: "button is-muted is-outlined #{params[:sort] == 'age' ? 'is-active' : ''}",
22+
<%= link_to 'Age', query_url(sort: 'age'),
23+
class: "button is-muted is-outlined #{params[:sort] == 'age' ? 'is-active' : ''}",
2324
role: 'button', 'aria-label': 'Sort by age' %>
2425
</div>
2526

‎app/views/users/posts.html.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
<div class="has-color-tertiary-500 category-meta">
1111
<span title="<%= post_count %> posts">
1212
<%= short_number_to_human post_count, precision: 1, significant: false %>
13-
<%= 'post'.pluralize(post_count) %>
13+
<%= 'post'.pluralize(post_count) %>
1414
</span>
1515

1616
<div class="button-list is-gutterless has-margin-2">
17-
<%= link_to 'Activity', request.params.merge(sort: 'activity'),
17+
<%= link_to 'Activity', query_url(sort: 'activity'),
1818
class: 'button is-muted is-outlined ' + (active_search?('last_activity') ? 'is-active' : ''),
1919
role: 'button', 'aria-label': 'Sort by activity' %>
20-
<%= link_to 'Age', request.params.merge(sort: 'age'),
20+
<%= link_to 'Age', query_url(sort: 'age'),
2121
class: 'button is-muted is-outlined ' + (active_search?('created_at') ? 'is-active' : ''),
2222
role: 'button', 'aria-label': 'Sort by age' %>
23-
<%= link_to 'Score', request.params.merge(sort: 'score'),
23+
<%= link_to 'Score', query_url(sort: 'score'),
2424
class: 'button is-muted is-outlined ' + (active_search?('score') ? 'is-active' : ''),
2525
role: 'button', 'aria-label': 'Sort by score' %>
2626
</div>

0 commit comments

Comments
 (0)