From 4d2898e5456777799058ad84a134a08313287c66 Mon Sep 17 00:00:00 2001 From: Toks Date: Wed, 26 Nov 2014 19:04:35 -0500 Subject: [PATCH] fixes #2220 --- app/controllers/saved_searches_controller.rb | 4 +- app/views/saved_searches/index.html.erb | 45 +++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb index 743fe7783..1151012f7 100644 --- a/app/controllers/saved_searches_controller.rb +++ b/app/controllers/saved_searches_controller.rb @@ -2,7 +2,9 @@ class SavedSearchesController < ApplicationController respond_to :html, :js def index - @saved_searches = saved_searches.order("name") + @saved_searches = saved_searches.order("tag_query") + @categories = @saved_searches.group_by{|saved_search| saved_search.category.to_s} + @categories = @categories.sort_by{|category, saved_searches| category.to_s} end def create diff --git a/app/views/saved_searches/index.html.erb b/app/views/saved_searches/index.html.erb index caf77fa70..407c15d4e 100644 --- a/app/views/saved_searches/index.html.erb +++ b/app/views/saved_searches/index.html.erb @@ -2,28 +2,31 @@

Saved Searches

- - - - - - - - - - - <% @saved_searches.each do |saved_search| %> - - - - + <% @categories.each do |category, saved_searches| %> +

<%= category.present? ? category : "Uncategorized" %>

+
TagsCategory
<%= link_to saved_search.tag_query, posts_path(:tags => saved_search.tag_query) %><%= saved_search.category %> - <%= link_to "edit", edit_saved_search_path(saved_search) %> | - <%= link_to "delete", saved_search_path(saved_search), :method => :delete, :remote => true %> -
+ + + + + - <% end %> - -
TagsCategory
+ + + + <% saved_searches.each do |saved_search| %> + + <%= link_to saved_search.tag_query, posts_path(:tags => saved_search.tag_query) %> + <%= saved_search.category %> + + <%= link_to "edit", edit_saved_search_path(saved_search) %> | + <%= link_to "delete", saved_search_path(saved_search), :method => :delete, :remote => true %> + + + <% end %> + + + <% end %>