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

Add quick search for #1868

Browse Source
This commit is contained in:
Toks
2013-07-21 17:24:59 -04:00
parent 150d5003ff
commit f570b9b70d
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmails_controller.rb
View File

@@ -17,8 +17,8 @@ class DmailsController < ApplicationController
if params[:folder] && params[:set_default_folder] if params[:folder] && params[:set_default_folder]
cookies.permanent[:dmail_folder] = params[:folder] cookies.permanent[:dmail_folder] = params[:folder]
end end
@search = Dmail.visible.search(params[:search]) @query = Dmail.visible.search(params[:search])
@dmails = @search.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit]) @dmails = @query.order("dmails.created_at desc").paginate(params[:page], :limit => params[:limit])
respond_with(@dmails) do |format| respond_with(@dmails) do |format|
format.xml do format.xml do
render :xml => @dmails.to_xml(:root => "dmails") render :xml => @dmails.to_xml(:root => "dmails")

3
app/views/dmails/_quick_search.html.erb Normal file
View File

@@ -0,0 +1,3 @@
<%= form_tag(dmails_path, :method => :get) do %>
<%= text_field "search", "message_matches", :id => "quick_search_message_matches", :placeholder => "Search messages" %>
<% end %>

1
app/views/dmails/_secondary_links.html.erb
View File

@@ -1,5 +1,6 @@
<% content_for(:secondary_links) do %> <% content_for(:secondary_links) do %>
<menu> <menu>
<li><%= render "quick_search" %></li>
<li><%= link_to "All", dmails_path(:search => {:owner_id => CurrentUser.id}, :folder => "all", :set_default_folder => true) %></li> <li><%= link_to "All", dmails_path(:search => {:owner_id => CurrentUser.id}, :folder => "all", :set_default_folder => true) %></li>
<li><%= link_to "Received", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received", :set_default_folder => true) %></li> <li><%= link_to "Received", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received", :set_default_folder => true) %></li>
<li><%= link_to "Sent", dmails_path(:search => {:owner_id => CurrentUser.id, :from_id => CurrentUser.id}, :folder => "sent", :set_default_folder => true) %></li> <li><%= link_to "Sent", dmails_path(:search => {:owner_id => CurrentUser.id, :from_id => CurrentUser.id}, :folder => "sent", :set_default_folder => true) %></li>