jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3495 from BrokenEagle/fix-missing-super-search

Browse Source 
Fix missing controllers for search[id] (Ref #3430)
This commit is contained in:
Albert Yi
2018-01-15 11:11:24 -08:00
committed by GitHub
parent dfd343f70e ba7fadf6e9
commit 7ca3d2735c
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/artist_commentary_version.rb
View File

@@ -6,8 +6,8 @@ class ArtistCommentaryVersion < ApplicationRecord
attr_accessible :post_id, :original_title, :original_description, :translated_title, :translated_description attr_accessible :post_id, :original_title, :original_description, :translated_title, :translated_description
def self.search(params) def self.search(params)
q = where("true") q = super
params = {} if params.blank? return q if params.blank?
if params[:updater_id] if params[:updater_id]
q = q.where("updater_id = ?", params[:updater_id].to_i) q = q.where("updater_id = ?", params[:updater_id].to_i)

3
app/models/ban.rb
View File

@@ -26,7 +26,8 @@ class Ban < ApplicationRecord
end end
def self.search(params) def self.search(params)
q = where("true") q = super
return q if params.blank?
if params[:banner_name] if params[:banner_name]
q = q.where("banner_id = (select _.id from users _ where lower(_.name) = ?)", params[:banner_name].mb_chars.downcase) q = q.where("banner_id = (select _.id from users _ where lower(_.name) = ?)", params[:banner_name].mb_chars.downcase)

4
app/models/mod_action.rb
View File

@@ -51,8 +51,8 @@ class ModAction < ApplicationRecord
other: 2000 other: 2000
} }
def self.search(params = {}) def self.search(params)
q = where("true") q = super
return q if params.blank? return q if params.blank?
if params[:creator_id].present? if params[:creator_id].present?

4
app/models/note_version.rb
View File

@@ -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 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) def self.search(params)
q = where("true") q = super
params = {} if params.blank? return q if params.blank?
if params[:updater_id] if params[:updater_id]
q = q.where(updater_id: params[:updater_id].split(",").map(&:to_i)) q = q.where(updater_id: params[:updater_id].split(",").map(&:to_i))