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

saved searches: add more order options (#4171).

Browse Source
This commit is contained in:
evazion
2019-09-22 23:38:48 -05:00
parent a5949a4b28
commit a164951b54
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/saved_search.rb
View File

@@ -104,7 +104,16 @@ class SavedSearch < ApplicationRecord
q = q.labeled(params[:label]) q = q.labeled(params[:label])
end end
q.apply_default_order(params) case params[:order]
when "query"
q = q.order(:query).order(id: :desc)
when "label"
q = q.order(:labels).order(id: :desc)
else
q = q.apply_default_order(params)
end
q
end end
def populate(query, timeout: 10_000) def populate(query, timeout: 10_000)

3
app/views/saved_searches/index.html.erb
View File

@@ -8,8 +8,9 @@
</h1> </h1>
<%= search_form_for(saved_searches_path) do |f| %> <%= search_form_for(saved_searches_path) do |f| %>
<%= f.input :query_ilike, label: "Query", input_html: { value: params[:search][:query_ilike] } %> <%= f.input :query_ilike, label: "Query", hint: "Use * for wildcard", input_html: { value: params[:search][:query_ilike] } %>
<%= f.input :label, label: "Label", input_html: { value: params[:search][:label] } %> <%= f.input :label, label: "Label", input_html: { value: params[:search][:label] } %>
<%= f.input :order, collection: [%w[Newest id], %w[Query query], %w[Label label]], include_blank: false, selected: params[:search][:order] %>
<%= f.submit "Search" %> <%= f.submit "Search" %>
<% end %> <% end %>