From a44242b82a6b359cac4816b253ebe7590c28bbb7 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Nov 2015 13:40:05 +0100 Subject: [PATCH] orders results after search --- app/models/debate.rb | 15 ++++++++------- app/models/proposal.rb | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/models/debate.rb b/app/models/debate.rb index 74403139c..9902f7e72 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -26,13 +26,14 @@ class Debate < ActiveRecord::Base before_save :calculate_hot_score, :calculate_confidence_score - scope :for_render, -> { includes(:tags) } - scope :sort_by_hot_score , -> { order(hot_score: :desc) } - scope :sort_by_confidence_score , -> { order(confidence_score: :desc) } - scope :sort_by_created_at, -> { order(created_at: :desc) } - scope :sort_by_most_commented, -> { order(comments_count: :desc) } - scope :sort_by_random, -> { order("RANDOM()") } - scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } + scope :for_render, -> { includes(:tags) } + scope :sort_by_hot_score , -> { reorder(hot_score: :desc) } + scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) } + scope :sort_by_created_at, -> { reorder(created_at: :desc) } + scope :sort_by_most_commented, -> { reorder(comments_count: :desc) } + scope :sort_by_random, -> { reorder("RANDOM()") } + scope :sort_by_relevance, -> { all } + scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } # Ahoy setup visitable # Ahoy will automatically assign visit_id on create diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 67f3719e6..547a262a7 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -32,13 +32,14 @@ class Proposal < ActiveRecord::Base before_save :calculate_hot_score, :calculate_confidence_score - scope :for_render, -> { includes(:tags) } - scope :sort_by_hot_score , -> { order(hot_score: :desc) } - scope :sort_by_confidence_score , -> { order(confidence_score: :desc) } - scope :sort_by_created_at, -> { order(created_at: :desc) } - scope :sort_by_most_commented, -> { order(comments_count: :desc) } - scope :sort_by_random, -> { order("RANDOM()") } - scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } + scope :for_render, -> { includes(:tags) } + scope :sort_by_hot_score , -> { reorder(hot_score: :desc) } + scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) } + scope :sort_by_created_at, -> { reorder(created_at: :desc) } + scope :sort_by_most_commented, -> { reorder(comments_count: :desc) } + scope :sort_by_random, -> { reorder("RANDOM()") } + scope :sort_by_relevance , -> { all } + scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } pg_search_scope :pg_search, { against: {