From 08c31c5985beebca3d1f10b5ed235bd1e562bf62 Mon Sep 17 00:00:00 2001 From: kikito Date: Fri, 4 Sep 2015 14:17:59 +0200 Subject: [PATCH] calls all the sorting scopes the same way --- app/controllers/moderation/comments_controller.rb | 2 +- app/controllers/moderation/debates_controller.rb | 2 +- app/models/comment.rb | 2 +- app/models/debate.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb index b53785e81..3d8d960aa 100644 --- a/app/controllers/moderation/comments_controller.rb +++ b/app/controllers/moderation/comments_controller.rb @@ -27,7 +27,7 @@ class Moderation::CommentsController < Moderation::BaseController private def load_comments - @comments = Comment.accessible_by(current_ability, :hide).flagged.sorted_for_moderation.includes(:commentable) + @comments = Comment.accessible_by(current_ability, :hide).flagged.sort_for_moderation.includes(:commentable) end end diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb index 85441d3f2..ce970b082 100644 --- a/app/controllers/moderation/debates_controller.rb +++ b/app/controllers/moderation/debates_controller.rb @@ -26,7 +26,7 @@ class Moderation::DebatesController < Moderation::BaseController private def load_debates - @debates = Debate.accessible_by(current_ability, :hide).flagged.sorted_for_moderation + @debates = Debate.accessible_by(current_ability, :hide).flagged.sort_for_moderation end end diff --git a/app/models/comment.rb b/app/models/comment.rb index 8190ff363..8dd922714 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -17,7 +17,7 @@ class Comment < ActiveRecord::Base scope :recent, -> { order(id: :desc) } - scope :sorted_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) } + scope :sort_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) } scope :pending_flag_review, -> { where(ignored_flag_at: nil, hidden_at: nil) } scope :with_ignored_flag, -> { where("ignored_flag_at IS NOT NULL AND hidden_at IS NULL") } scope :flagged, -> { where("flags_count > 0") } diff --git a/app/models/debate.rb b/app/models/debate.rb index 84181c26d..f8f57fa97 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -23,7 +23,7 @@ class Debate < ActiveRecord::Base before_save :calculate_hot_score - scope :sorted_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) } + scope :sort_for_moderation, -> { order(flags_count: :desc, updated_at: :desc) } scope :pending_flag_review, -> { where(ignored_flag_at: nil, hidden_at: nil) } scope :with_ignored_flag, -> { where("ignored_flag_at IS NOT NULL AND hidden_at IS NULL") } scope :flagged, -> { where("flags_count > 0") }