diff --git a/app/models/artist_commentary_version.rb b/app/models/artist_commentary_version.rb index 83f335919..f92c88e18 100644 --- a/app/models/artist_commentary_version.rb +++ b/app/models/artist_commentary_version.rb @@ -6,8 +6,8 @@ class ArtistCommentaryVersion < ApplicationRecord attr_accessible :post_id, :original_title, :original_description, :translated_title, :translated_description def self.search(params) - q = where("true") - params = {} if params.blank? + q = super + return q if params.blank? if params[:updater_id] q = q.where("updater_id = ?", params[:updater_id].to_i) diff --git a/app/models/ban.rb b/app/models/ban.rb index f6a8e553b..2f965a499 100644 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -26,7 +26,8 @@ class Ban < ApplicationRecord end def self.search(params) - q = where("true") + q = super + return q if params.blank? if params[:banner_name] q = q.where("banner_id = (select _.id from users _ where lower(_.name) = ?)", params[:banner_name].mb_chars.downcase) diff --git a/app/models/mod_action.rb b/app/models/mod_action.rb index 02c7d6fef..df53a879e 100644 --- a/app/models/mod_action.rb +++ b/app/models/mod_action.rb @@ -4,8 +4,8 @@ class ModAction < ApplicationRecord validates_presence_of :creator_id attr_accessible :description - def self.search(params = {}) - q = where("true") + def self.search(params) + q = super return q if params.blank? if params[:creator_id].present? diff --git a/app/models/note_version.rb b/app/models/note_version.rb index c9c34a183..a152e07e4 100644 --- a/app/models/note_version.rb +++ b/app/models/note_version.rb @@ -5,8 +5,8 @@ class NoteVersion < ApplicationRecord attr_accessible :note_id, :x, :y, :width, :height, :body, :updater_id, :updater_ip_addr, :is_active, :post_id, :html_id, :version def self.search(params) - q = where("true") - params = {} if params.blank? + q = super + return q if params.blank? if params[:updater_id] q = q.where(updater_id: params[:updater_id].split(",").map(&:to_i))