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

Fix #5289: NoMethodError in /?search=.

Browse Source
This commit is contained in:
evazion
2022-10-14 20:11:16 -05:00
parent 9c48953e6f
commit b24e8ae2a7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -248,7 +248,7 @@ class ApplicationController < ActionController::Base
# => /tags?search[name]=touhou # => /tags?search[name]=touhou
def normalize_search def normalize_search
return unless request.get? || request.head? return unless request.get? || request.head?
params[:search] ||= ActionController::Parameters.new params[:search] = ActionController::Parameters.new unless params[:search].is_a?(ActionController::Parameters)
deep_reject_blank = lambda do |hash| deep_reject_blank = lambda do |hash|
hash.reject { |_k, v| v.blank? || (v.is_a?(Hash) && deep_reject_blank.call(v).blank?) } hash.reject { |_k, v| v.blank? || (v.is_a?(Hash) && deep_reject_blank.call(v).blank?) }

14
test/functional/application_controller_test.rb
View File

@@ -342,6 +342,20 @@ class ApplicationControllerTest < ActionDispatch::IntegrationTest
assert_equal([tags[0].id], response.parsed_body.pluck("id")) assert_equal([tags[0].id], response.parsed_body.pluck("id"))
end end
should "remove blank `search` params from the URL" do
get tags_path(search: { name: "touhou", blah: "" }), as: :json
assert_redirected_to tags_path(search: { name: "touhou" })
end
should "ignore invalid `search` params" do
get tags_path(search: "foo"), as: :json
assert_response :success
get tags_path("search[]": "foo"), as: :json
assert_response :success
end
should "support the expiry parameter" do should "support the expiry parameter" do
get posts_path, as: :json, params: { expiry: "1" } get posts_path, as: :json, params: { expiry: "1" }