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

Merge pull request #2966 from evazion/fix-artist-autocomplete

Browse Source 
Improve autocomplete on /artists, /wiki_pages, and /pools.
This commit is contained in:
Albert Yi
2017-04-10 14:29:05 -07:00
committed by GitHub
parent 843f3b783d b9693827c3
commit 0a45b99e33
12 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/artists_controller.rb
View File

@@ -38,7 +38,7 @@ class ArtistsController < ApplicationController
def index
search_params = params[:search].present? ? params[:search] : params
@artists = Artist.search(search_params).order("id desc").paginate(params[:page], :limit => params[:limit])
@artists = Artist.includes(:urls).search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
respond_with(@artists) do |format|
format.xml do
render :xml => @artists.to_xml(:include => [:urls], :root => "artists")

6
app/controllers/wiki_pages_controller.rb
View File

@@ -15,13 +15,13 @@ class WikiPagesController < ApplicationController
end
def index
@wiki_pages = WikiPage.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
@wiki_pages = WikiPage.search(params[:search]).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
respond_with(@wiki_pages) do |format|
format.html do
if params[:page].nil? || params[:page].to_i == 1
if @wiki_pages.count == 1
if @wiki_pages.length == 1
redirect_to(wiki_page_path(@wiki_pages.first))
elsif @wiki_pages.count == 0 && params[:search][:title].present? && params[:search][:title] !~ /\*/
elsif @wiki_pages.length == 0 && params[:search][:title].present? && params[:search][:title] !~ /\*/
redirect_to(wiki_pages_path(:search => {:title => "*#{params[:search][:title]}*"}))
end
end