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-artist").html('<a href="' + data.profile_url + '">' + data.artist_name + '</a>');
$("#source-tags").html(tag_html); $("#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) { if (data.danbooru_id) {
$("#source-record").html('<a href="/artists/' + data.danbooru_id + '">' + data.danbooru_name + '</a>'); $("#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 end
def search(params) def search(params)
q = active q = scoped
params = {} if params.blank? params = {} if params.blank?
case params[:name] case params[:name]

9
db/structure.sql
View File

@@ -5927,13 +5927,6 @@ CREATE INDEX index_post_votes_on_user_id ON post_votes USING btree (user_id);
CREATE INDEX index_posts_on_created_at ON posts USING btree (created_at); CREATE INDEX index_posts_on_created_at ON posts USING btree (created_at);
--
-- Name: index_posts_on_created_at_date; Type: INDEX; Schema: public; Owner: -; Tablespace:
--
CREATE INDEX index_posts_on_created_at_date ON posts USING btree (date(created_at));
-- --
-- Name: index_posts_on_file_size; Type: INDEX; Schema: public; Owner: -; Tablespace: -- Name: index_posts_on_file_size; Type: INDEX; Schema: public; Owner: -; Tablespace:
-- --
@@ -6414,3 +6407,5 @@ INSERT INTO schema_migrations (version) VALUES ('20130328092739');
INSERT INTO schema_migrations (version) VALUES ('20130331180246'); INSERT INTO schema_migrations (version) VALUES ('20130331180246');
INSERT INTO schema_migrations (version) VALUES ('20130331182719'); INSERT INTO schema_migrations (version) VALUES ('20130331182719');
INSERT INTO schema_migrations (version) VALUES ('20130401013601');