Skip to content

Commit 35fced2

Browse files
authored
Merge pull request #1675 from codidact/0valt/1674/user-sorting
fixed default sort param for user searches
2 parents 7a2a1f6 + aca3cff commit 35fced2

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/controllers/users_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class UsersController < ApplicationController
1515
before_action :check_deleted, only: [:show, :posts, :activity]
1616

1717
def index
18-
sort_param = { reputation: :reputation, age: :created_at }[params[:sort]&.to_sym] || :reputation
18+
@sort_param = { reputation: :reputation, age: :created_at }[params[:sort]&.to_sym] || :reputation
1919

2020
@users = if params[:search].present?
2121
user_scope.search(params[:search])
@@ -25,7 +25,7 @@ def index
2525

2626
@users = @users.where.not(deleted: true)
2727
.where.not(community_users: { deleted: true })
28-
.order(sort_param => :desc)
28+
.order(@sort_param => :desc)
2929
.paginate(page: params[:page], per_page: 48)
3030

3131
@post_counts = Post.where(user_id: @users.pluck(:id).uniq).group(:user_id).count

app/views/users/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="form-group">
88
<%= label_tag :search, "Search", class: "form-element" %>
99
<%= text_field_tag :search, params[:search], class: 'form-element' %>
10-
<%= hidden_field_tag :sort, params[:sort] %>
10+
<%= hidden_field_tag :sort, params[:sort] || @sort_param %>
1111
</div>
1212
<div class="actions has-padding-bottom-1">
1313
<button type="submit" class="button is-filled is-medium"><i class="fas fa-search"></i><span class="sr-only">Search</span></button>

0 commit comments

Comments
 (0)