Merge pull request #2012 from codidact/0valt/2003/filter-apply-sorting

Author: ArtOfCode-

app/controllers/categories_controller.rb

@@ -158,10 +158,15 @@ def verify_view_access
   end
 
   def set_list_posts
-    sort_params = { activity: { last_activity: :desc }, age: { created_at: :desc }, score: { score: :desc },
+    @default_sort_type = :activity
+    @sort_type = params[:sort]&.to_sym || @default_sort_type
+
+    sort_params = { activity: { last_activity: :desc },
+                    age: { created_at: :desc },
+                    score: { score: :desc },
                     lottery: [Arel.sql('(RAND() - ? * DATEDIFF(CURRENT_TIMESTAMP, posts.created_at)) DESC'),
                               SiteSetting['LotteryAgeDeprecationSpeed']] }
-    sort_param = sort_params[params[:sort]&.to_sym] || { last_activity: :desc }
+
     @posts = @category.posts
                       .undeleted
                       .where(post_type_id: @category.display_post_types)
@@ -200,7 +205,8 @@ def set_list_posts
 
     @posts = helpers.qualifiers_to_sql(filter_qualifiers, @posts, current_user)
     @filtered = filter_qualifiers.any?
-    @posts = @posts.paginate(page: params[:page], per_page: 50).order(sort_param)
+    @posts = @posts.paginate(page: params[:page], per_page: 50)
+                   .order(sort_params[@sort_type])
   end
 
   def clear_categories_cache

app/views/search/_filters.html.erb

@@ -1,9 +1,10 @@
 <% allow_delete ||= false %>
 <% allow_apply = true if allow_apply.nil? %>
 <% @active_filter ||= {} %>
+<% @default_sort_type ||= '' %>
 
 <div class="form-group">
-  <input name="sort" type="hidden" value="<%= params[:sort] || '' %>" />
+  <input name="sort" type="hidden" value="<%= params[:sort] || @default_sort_type %>" />
 
   <div class="search-filters-filter">
     <div>