From d2f92b7aa7a51e3a48266ca0ee5d5e4c40e0cecf Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 16 Dec 2018 12:05:35 -0600 Subject: [PATCH] artists: fix quick search to search urls. ref: https://danbooru.donmai.us/forum_topics/9127?page=265#forum_post_153124 --- app/models/artist.rb | 12 ++++++++++++ app/views/artists/_quick_search.html.erb | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models/artist.rb b/app/models/artist.rb index 509d09c1b..0ed4c96e3 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -490,6 +490,14 @@ class Artist < ApplicationRecord 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) q = super @@ -504,6 +512,10 @@ class Artist < ApplicationRecord q = q.any_name_matches(params[:any_name_matches]) 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? q = q.url_matches(params[:url_matches]) end diff --git a/app/views/artists/_quick_search.html.erb b/app/views/artists/_quick_search.html.erb index 70bd174be..5e977cbfc 100644 --- a/app/views/artists/_quick_search.html.erb +++ b/app/views/artists/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= 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 %>