Download as
Browse Code »

Commit 358bd132a230a36d346233edb832065fff79de4c

Authored by Rodrigo Souto
1 parent 71494e1c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[pluginize-solr] Moving category index back

Showing 3 changed files with 51 additions and 2 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @358bd13
... ... @@ -36,6 +36,26 @@ class SearchController < PublicController
36 36 render :action => @results.keys.first if @results.keys.size == 1
37 37 end
38 38  
  39 + # view the summary of one category
  40 + def category_index
  41 + @results = {}
  42 + @order = []
  43 + @names = {}
  44 + limit = MULTIPLE_SEARCH_LIMIT
  45 + [
  46 + [ :people, _('People'), :recent_people ],
  47 + [ :enterprises, _('Enterprises'), :recent_enterprises ],
  48 + [ :products, _('Products'), :recent_products ],
  49 + [ :events, _('Upcoming events'), :upcoming_events ],
  50 + [ :communities, _('Communities'), :recent_communities ],
  51 + [ :articles, _('Contents'), :recent_articles ]
  52 + ].each do |asset, name, filter|
  53 + @order << asset
  54 + @results[asset] = @category.send(filter, limit)
  55 + raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
  56 + @names[asset] = name
  57 + end
  58 + end
39 59  
40 60 def articles
41 61 if @search_engine && !@empty_query
... ...
app/helpers/search_helper.rb
  Diff comments   View file @358bd13
... ... @@ -27,7 +27,7 @@ module SearchHelper
27 27  
28 28 def search_page_title(title, category = nil)
29 29 title = "<h1>" + title
30   - title += '<small>' + category.name + '</small>' if category
  30 + title += ' - <small>' + category.name + '</small>' if category
31 31 title + "</h1>"
32 32 end
33 33  
... ... @@ -42,7 +42,7 @@ module SearchHelper
42 42 [:enterprises, :products].include?(asset)
43 43 end
44 44  
45   - def display_results(asset)
  45 + def display_results(asset = nil)
46 46 if map_capable?(asset) and map_search?
47 47 partial = 'google_maps'
48 48 klass = 'map'
... ...
app/views/search/category_index.rhtml 0 → 100644
  Diff comments   View file @358bd13
... ... @@ -0,0 +1,29 @@
  1 +<div id="search-page" class="<%= "view-category" if @category %>">
  2 +
  3 + <% if @category %>
  4 + <div id="category-image"><%= image_tag(@category.image.public_filename(:thumb), :id => 'category-image') if @category.image %></div>
  5 + <% end %>
  6 +
  7 + <%= search_page_title(_('Search Results'), @category) %>
  8 + <%= render :partial => 'search_form', :locals => { :hint => '' } if @search_engine %>
  9 + <%= category_context(@category, params) %>
  10 + <%= display_results %>
  11 +
  12 + <div id="category-childs">
  13 + <% if @category %>
  14 + <h2> <%= _('Sub-categories') %> </h2>
  15 + <% if @category.children.empty? %>
  16 + <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
  17 + <% else %>
  18 + <ul>
  19 + <% @category.children.each do |c| %>
  20 + <li> <%= link_to_category c, false %> </li>
  21 + <% end %>
  22 + </ul>
  23 + <% end %>
  24 + <% end %>
  25 + </div>
  26 +
  27 +</div>
  28 +
  29 +<div style="clear: both"></div>
... ...