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

Option to set category when first creating a saved search

Browse Source
This commit is contained in:
Toks
2014-11-26 19:41:54 -05:00
parent 82b3754d3b
commit e53970d6f6
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/posts.js
View File

@@ -14,6 +14,7 @@
if ($("#c-posts").length && $("#a-index").length) { if ($("#c-posts").length && $("#a-index").length) {
this.initialize_excerpt(); this.initialize_excerpt();
this.initialize_saved_searches();
} }
if ($("#c-posts").length && $("#a-show").length) { if ($("#c-posts").length && $("#a-show").length) {
@@ -513,11 +514,19 @@
}); });
} }
Danbooru.Post.save_search = function() { Danbooru.Post.initialize_saved_searches = function() {
$.post( $("#save-search").click(function() {
"/saved_searches.js", var input = window.prompt("Category for this saved search (optional):");
{"saved_search[tag_query]": $("#tags").val()} if (input !== null) {
); $.post(
"/saved_searches.js",
{
"tags": $("#tags").attr("value"),
"category": input
}
);
}
});
} }
})(); })();

2
app/controllers/saved_searches_controller.rb
View File

@@ -14,7 +14,7 @@ class SavedSearchesController < ApplicationController
end end
def create def create
@saved_search = saved_searches.create(:tag_query => params[:tags]) @saved_search = saved_searches.create(:tag_query => params[:tags], :category => params[:category])
end end
def destroy def destroy

2
app/views/saved_searches/_interface.html.erb
View File

@@ -3,7 +3,7 @@
<% if CurrentUser.user.has_saved_searches? && saved_searches.tagged(params[:tags]) %> <% if CurrentUser.user.has_saved_searches? && saved_searches.tagged(params[:tags]) %>
<%= button_to "Remove this saved search", saved_search_path(saved_searches.tagged(params[:tags]), :tags => params[:tags]), :remote => true, :method => :delete %> <%= button_to "Remove this saved search", saved_search_path(saved_searches.tagged(params[:tags]), :tags => params[:tags]), :remote => true, :method => :delete %>
<% elsif CurrentUser.user.is_member? %> <% elsif CurrentUser.user.is_member? %>
<%= button_to "Save this search", saved_searches_path(:tags => params[:tags]), :remote => true, :method => :post %> <%= button_tag "Save this search", :id => "save-search" %>
<% end %> <% end %>
<% end %> <% end %>

1
app/views/saved_searches/create.js.erb
View File

@@ -3,4 +3,5 @@
<% else %> <% else %>
Danbooru.notice("Search '<%= j @saved_search.tag_query %>' was saved"); Danbooru.notice("Search '<%= j @saved_search.tag_query %>' was saved");
$("#saved-searches-nav").html("<%= j render('saved_searches/interface', :saved_searches => CurrentUser.user.saved_searches) %>"); $("#saved-searches-nav").html("<%= j render('saved_searches/interface', :saved_searches => CurrentUser.user.saved_searches) %>");
Danbooru.Post.initialize_saved_searches();
<% end %> <% end %>

1
app/views/saved_searches/destroy.js.erb
View File

@@ -1,3 +1,4 @@
Danbooru.notice("Search '<%= j @saved_search.tag_query %>' was deleted"); Danbooru.notice("Search '<%= j @saved_search.tag_query %>' was deleted");
$("#saved-searches-nav").html("<%= j render('saved_searches/interface', :saved_searches => CurrentUser.user.saved_searches) %>"); $("#saved-searches-nav").html("<%= j render('saved_searches/interface', :saved_searches => CurrentUser.user.saved_searches) %>");
Danbooru.Post.initialize_saved_searches();
$("#saved-search-<%= @saved_search.id %>").remove(); $("#saved-search-<%= @saved_search.id %>").remove();