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

Added redirect parameter to quick search function

Browse Source 
- Also fixed quick search parameter on wiki pages
This commit is contained in:
BrokenEagle
2020-01-25 20:32:33 +00:00
parent 75ac11166c
commit 217f5e6c81
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -179,11 +179,11 @@ module ApplicationHelper
tag.input value: "Preview", type: "button", class: "dtext-preview-button", "data-input-id": input_id, "data-preview-id": preview_id
end
def quick_search_form_for(attribute, url, name, autocomplete: nil, &block)
def quick_search_form_for(attribute, url, name, autocomplete: nil, redirect: false, &block)
tag.li do
search_form_for(url, classes: "quick-search-form one-line-form") do |f|
out = f.input attribute, label: false, placeholder: "Search #{name}", input_html: { id: nil, "data-autocomplete": autocomplete }
out += tag.input type: :hidden, name: :redirect, value: 1
out += tag.input type: :hidden, name: :redirect, value: redirect
out += capture { yield f } if block_given?
out
end

2
app/views/artists/_secondary_links.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:any_name_or_url_matches, artists_path, "artists", autocomplete: "artist") %>
<%= quick_search_form_for(:any_name_or_url_matches, artists_path, "artists", autocomplete: "artist", redirect: true) %>
<%= subnav_link_to "Listing", artists_path %>
<%= subnav_link_to "Banned", artists_path(search: { is_banned: "true", order: "updated_at" }) %>
<% if CurrentUser.is_member? %>

2
app/views/pools/_secondary_links.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:name_matches, pools_path, "pools", autocomplete: "pool") %>
<%= quick_search_form_for(:name_matches, pools_path, "pools", autocomplete: "pool", redirect: true) %>
<%= subnav_link_to "Gallery", gallery_pools_path %>
<%= subnav_link_to "Listing", pools_path %>
<%= subnav_link_to "New", new_pool_path %>

2
app/views/users/_secondary_links.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:name_matches, users_path, "users", autocomplete: "user") %>
<%= quick_search_form_for(:name_matches, users_path, "users", autocomplete: "user", redirect: true) %>
<%= subnav_link_to "Listing", users_path %>
<%= subnav_link_to "Search", search_users_path %>

2
app/views/wiki_pages/_secondary_links.html.erb
View File

@@ -1,5 +1,5 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:title, wiki_pages_path, "wiki pages", autocomplete: "wiki-page") %>
<%= quick_search_form_for(:title_normalize, wiki_pages_path, "wiki pages", autocomplete: "wiki-page", redirect: true) %>
<%= subnav_link_to "Listing", wiki_pages_path %>
<%= subnav_link_to "Search", search_wiki_pages_path %>
<% if CurrentUser.is_member? %>