diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js index b61c7d88d..4c09a1866 100644 --- a/app/assets/javascripts/uploads.js +++ b/app/assets/javascripts/uploads.js @@ -57,7 +57,7 @@ $("#source-artist").html('' + data.artist_name + ''); $("#source-tags").html(tag_html); - var new_artist_link = 'new'; + var new_artist_link = 'new'; if (data.danbooru_id) { $("#source-record").html('' + data.danbooru_name + ''); diff --git a/app/models/artist.rb b/app/models/artist.rb index 798174795..6ff64f8cf 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -231,7 +231,7 @@ class Artist < ActiveRecord::Base end def search(params) - q = active + q = scoped params = {} if params.blank? case params[:name] diff --git a/db/structure.sql b/db/structure.sql index 6d43bb823..742c4c657 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -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); --- --- 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: -- @@ -6413,4 +6406,6 @@ INSERT INTO schema_migrations (version) VALUES ('20130328092739'); INSERT INTO schema_migrations (version) VALUES ('20130331180246'); -INSERT INTO schema_migrations (version) VALUES ('20130331182719'); \ No newline at end of file +INSERT INTO schema_migrations (version) VALUES ('20130331182719'); + +INSERT INTO schema_migrations (version) VALUES ('20130401013601'); \ No newline at end of file