artists: fix quick search to search urls.
ref: https://danbooru.donmai.us/forum_topics/9127?page=265#forum_post_153124
This commit is contained in:
@@ -490,6 +490,14 @@ class Artist < ApplicationRecord
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def any_name_or_url_matches(query)
|
||||||
|
if query =~ %r!\Ahttps?://!i
|
||||||
|
url_matches(query)
|
||||||
|
else
|
||||||
|
any_name_matches(query)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def search(params)
|
def search(params)
|
||||||
q = super
|
q = super
|
||||||
|
|
||||||
@@ -504,6 +512,10 @@ class Artist < ApplicationRecord
|
|||||||
q = q.any_name_matches(params[:any_name_matches])
|
q = q.any_name_matches(params[:any_name_matches])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if params[:any_name_or_url_matches].present?
|
||||||
|
q = q.any_name_or_url_matches(params[:any_name_or_url_matches])
|
||||||
|
end
|
||||||
|
|
||||||
if params[:url_matches].present?
|
if params[:url_matches].present?
|
||||||
q = q.url_matches(params[:url_matches])
|
q = q.url_matches(params[:url_matches])
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<%= form_tag(artists_path, :method => :get) do %>
|
<%= form_tag(artists_path, :method => :get) do %>
|
||||||
<%= text_field "search", "name", id: "quick_search_name", placeholder: "Search artists", data: { autocomplete: "artist" } %>
|
<%= text_field "search", "any_name_or_url_matches", id: "quick_search_name", placeholder: "Search artists", "data-autocomplete": "artist" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user