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

fixes #1708

Browse Source
This commit is contained in:
r888888888
2013-06-05 15:00:15 -07:00
parent ffc8c6f92c
commit bd370da2fc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/artists.js
View File

@@ -10,12 +10,17 @@
Danbooru.Artist.initialize_check_name_link = function() { Danbooru.Artist.initialize_check_name_link = function() {
$("#check-name-link").click(function(e) { $("#check-name-link").click(function(e) {
var artist_name = $("#artist_name").val(); var artist_name = $("#artist_name").val();
if (artist_name.length === 0) {
$("#check-name-result").html("OK");
}
$.get("/artists.json?name=" + artist_name, $.get("/artists.json?name=" + artist_name,
function(data) { function(data) {
if (data.length) { if (data.length) {
$("#check-name-result").html("Taken") $("#check-name-result").html("Taken");
} else { } else {
$("#check-name-result").html("OK") $("#check-name-result").html("OK");
} }
} }
); );

3
app/controllers/artists_controller.rb
View File

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