Skip to content

Commit 33b72fc

Browse files
authored
Added pagy to user tags (#8635)
* Added pagy to user tags * Pagy * Pagy * Pagy * remove whitespaces * pagy_array
1 parent 825ddf9 commit 33b72fc

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

app/controllers/user_tags_controller.rb

+6-9
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,22 @@ def index
1010
@paginated = true
1111
if params[:search]
1212
keyword = params[:search]
13-
@user_tags = UserTag
13+
@pagy, @user_tags = pagy_array(UserTag
1414
.select('value')
1515
.where("value LIKE :keyword", keyword: "%#{keyword}%")
1616
.group(:value)
1717
.order('value ASC')
18-
.count('value').to_a
19-
.paginate(page: params[:page], per_page: 24)
18+
.count('value').to_a, items: 24)
2019
elsif @toggle == "value"
21-
@user_tags = UserTag.group(:value)
20+
@pagy, @user_tags = pagy_array(UserTag.group(:value)
2221
.select('value')
2322
.order('value ASC')
24-
.count('value').to_a
25-
.paginate(page: params[:page], per_page: 24)
23+
.count('value').to_a, items: 24)
2624
else # @toggle == "uses"
27-
@user_tags = UserTag.group(:value)
25+
@pagy, @user_tags = pagy_array(UserTag.group(:value)
2826
.select('value')
2927
.order('count_value DESC')
30-
.count('value').to_a
31-
.paginate(page: params[:page], per_page: 24)
28+
.count('value').to_a, items: 24)
3229
end
3330
end
3431

app/views/user_tags/index.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</tr>
3232
<% end %>
3333
</table>
34-
<%= will_paginate @user_tags, renderer: WillPaginate::ActionView::BootstrapLinkRenderer if @paginated %>
34+
<% if @pagy %> <%= raw pagy_bootstrap_nav @pagy %> <% else %> <%= will_paginate @user_tags, renderer: WillPaginate::ActionView::BootstrapLinkRenderer %> <% end %>
3535

3636
<hr />
3737

0 commit comments

Comments
 (0)