From a1675c65a8ab4c506025202f600c2aff8328f0c9 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 30 Mar 2013 15:18:52 -0400 Subject: [PATCH] fixes #1144 --- app/views/artists/_quick_search.html.erb | 2 +- app/views/pools/_quick_search.html.erb | 2 +- app/views/tags/_quick_search.html.erb | 2 +- app/views/wiki_pages/_quick_search.html.erb | 2 +- .../20130328092739_change_source_pattern_index_on_posts.rb | 7 ++----- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/views/artists/_quick_search.html.erb b/app/views/artists/_quick_search.html.erb index 149f8aa86..6f2a72762 100644 --- a/app/views/artists/_quick_search.html.erb +++ b/app/views/artists/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(artists_path, :method => :get) do %> - <%= text_field "search", "name" %> + <%= text_field "search", "name", :id => "quicksearch_name" %> <% end %> diff --git a/app/views/pools/_quick_search.html.erb b/app/views/pools/_quick_search.html.erb index 6044cebed..d3dc24f45 100644 --- a/app/views/pools/_quick_search.html.erb +++ b/app/views/pools/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(pools_path, :method => :get) do %> - <%= text_field "search", "name_matches" %> + <%= text_field "search", "name_matches", :id => "quick_search_name_matches" %> <% end %> diff --git a/app/views/tags/_quick_search.html.erb b/app/views/tags/_quick_search.html.erb index fb5e46c26..9cc28663d 100644 --- a/app/views/tags/_quick_search.html.erb +++ b/app/views/tags/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(tags_path, :method => :get) do %> - <%= text_field "search", "name_matches" %> + <%= text_field "search", "name_matches", :id => "quick_search_name_matches" %> <% end %> diff --git a/app/views/wiki_pages/_quick_search.html.erb b/app/views/wiki_pages/_quick_search.html.erb index 4e2762a5b..7fd66b9b9 100644 --- a/app/views/wiki_pages/_quick_search.html.erb +++ b/app/views/wiki_pages/_quick_search.html.erb @@ -1,3 +1,3 @@ <%= form_tag(wiki_pages_path, :method => :get) do %> - <%= text_field "search", "title" %> + <%= text_field "search", "title", :id => "quick_search_title" %> <% end %> diff --git a/db/migrate/20130328092739_change_source_pattern_index_on_posts.rb b/db/migrate/20130328092739_change_source_pattern_index_on_posts.rb index 1a5fb6131..741db8bff 100644 --- a/db/migrate/20130328092739_change_source_pattern_index_on_posts.rb +++ b/db/migrate/20130328092739_change_source_pattern_index_on_posts.rb @@ -1,11 +1,8 @@ class ChangeSourcePatternIndexOnPosts < ActiveRecord::Migration def up execute "set statement_timeout = 0" - begin - execute "DROP INDEX index_posts_on_pixiv_suffix" - execute "DROP INDEX index_posts_on_source_pattern" - rescue Exception - end + execute "DROP INDEX index_posts_on_pixiv_suffix" + execute "DROP INDEX index_posts_on_source_pattern" execute "CREATE FUNCTION SourcePattern(src text) RETURNS text AS $$ BEGIN RETURN regexp_replace(src, '^[^/]*(//)?[^/]*\.pixiv\.net/img.*(/[^/]*/[^/]*)$', E'pixiv\\\\2');