Sort by name by default, allow sorting by start and end date

friendlycart · Nov 8, 2023 · 6fd6acc · 6fd6acc
1 parent 77e6323
commit 6fd6acc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/solidus_friendly_promotions/admin/promotions_controller.rb b/app/controllers/solidus_friendly_promotions/admin/promotions_controller.rb
@@ -36,6 +36,7 @@ def collection
 
         @collection = super
         @search = @collection.ransack(params[:q])
+        @search.sorts = "name asc" if @search.sorts.empty?
         @collection = @search.result(distinct: true)
           .includes(promotion_includes)
           .page(params[:page])

diff --git a/app/views/solidus_friendly_promotions/admin/promotions/_table.html.erb b/app/views/solidus_friendly_promotions/admin/promotions/_table.html.erb
@@ -1,12 +1,12 @@
 <table class="index">
   <thead>
     <tr>
-      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:name) %></th>
+      <th><%= sort_link @search, :name %></th>
       <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %></th>
       <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:status) %></th>
       <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:usage) %></th>
-      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:starts_at) %></th>
-      <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:expires_at) %></th>
+      <th><%= sort_link @search, :starts_at %></th>
+      <th><%= sort_link @search, :expires_at %></th>
       <th><%= SolidusFriendlyPromotions::Promotion.human_attribute_name(:lane) %></th>
       <th class="actions"></th>
     </tr>