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

fix pool search

Browse Source
This commit is contained in:
albert
2013-02-17 15:16:47 -05:00
parent b4e338bf0f
commit 4b6a9136b9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@@ -113,7 +113,7 @@ module ApplicationHelper
def search_field(method, options = {}) def search_field(method, options = {})
name = options[:label] || method.titleize name = options[:label] || method.titleize
raw '<div class="input"><label for="search_' + method + '">' + name + '</label><input type="text" name="search_' + method + '" id="search_' + method + '"></div>' raw '<div class="input"><label for="search_' + method + '">' + name + '</label><input type="text" name="search[' + method + ']" id="search_' + method + '"></div>'
end end
protected protected

12
app/models/pool.rb
View File

@@ -24,19 +24,19 @@ class Pool < ActiveRecord::Base
q = scoped q = scoped
return q if params.blank? return q if params.blank?
if params[:name_matches] if params[:name_matches].present?
q = q.where("name like ? escape E'\\\\'", params[:name_matches]) q = q.where("name like ? escape E'\\\\'", params[:name_matches].to_escaped_for_sql_like)
end end
if params[:description_matches] if params[:description_matches].present?
q = q.where("description like ? escape E'\\\\'", params[:description_matches]) q = q.where("description like ? escape E'\\\\'", params[:description_matches].to_escaped_for_sql_like)
end end
if params[:creator_name] if params[:creator_name].present?
q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase) q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase)
end end
if params[:creator_id] if params[:creator_id].present?
q = q.where("creator_id = ?", params[:creator_id].to_i) q = q.where("creator_id = ?", params[:creator_id].to_i)
end end