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

fixes #1154

Browse Source
This commit is contained in:
albert
2013-03-31 22:16:31 -04:00
parent f07379697b
commit e305f8e501
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/uploads.js
View File

@@ -57,7 +57,7 @@
$("#source-artist").html('<a href="' + data.profile_url + '">' + data.artist_name + '</a>');
$("#source-tags").html(tag_html);
var new_artist_link = '<a href="/artists/new?name=' + data.unique_id + '&other_names=' + data.artist_name + '&urls=' + encodeURIComponent(data.profile_url) + '+' + encodeURIComponent(data.image_url) + '">new</a>';
var new_artist_link = '<a target="_blank" href="/artists/new?name=' + data.unique_id + '&other_names=' + data.artist_name + '&urls=' + encodeURIComponent(data.profile_url) + '+' + encodeURIComponent(data.image_url) + '">new</a>';
if (data.danbooru_id) {
$("#source-record").html('<a href="/artists/' + data.danbooru_id + '">' + data.danbooru_name + '</a>');

2
app/models/artist.rb
View File

@@ -231,7 +231,7 @@ class Artist < ActiveRecord::Base
end
def search(params)
q = active
q = scoped
params = {} if params.blank?
case params[:name]