Download as
Browse Code »

Commit 82fbfb86637f337674231209da0d4792c3d19014

Authored by Rodrigo Souto
1 parent ca19bf6a
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

[search-improvements] Refactor search filters

Showing 12 changed files with 73 additions and 70 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @82fbfb8
@@ -8,7 +8,7 @@ class SearchController < PublicController @@ -8,7 +8,7 @@ class SearchController < PublicController
8 before_filter :load_category, :except => :suggestions 8 before_filter :load_category, :except => :suggestions
9 before_filter :load_search_assets, :except => :suggestions 9 before_filter :load_search_assets, :except => :suggestions
10 before_filter :load_query, :except => :suggestions 10 before_filter :load_query, :except => :suggestions
11 - before_filter :load_filter, :except => :suggestions 11 + before_filter :load_order, :except => :suggestions
12 12
13 # Backwards compatibility with old URLs 13 # Backwards compatibility with old URLs
14 def redirect_asset_param 14 def redirect_asset_param
@@ -152,7 +152,7 @@ class SearchController < PublicController @@ -152,7 +152,7 @@ class SearchController < PublicController
152 152
153 def load_query 153 def load_query
154 @asset = (params[:asset] || params[:action]).to_sym 154 @asset = (params[:asset] || params[:action]).to_sym
155 - @order ||= [@asset] 155 + @assets ||= [@asset]
156 @searches ||= {} 156 @searches ||= {}
157 157
158 @query = params[:query] || '' 158 @query = params[:query] || ''
@@ -189,11 +189,11 @@ class SearchController < PublicController @@ -189,11 +189,11 @@ class SearchController < PublicController
189 @names = @titles if @names.nil? 189 @names = @titles if @names.nil?
190 end 190 end
191 191
192 - def load_filter  
193 - @filter = 'more_recent' 192 + def load_order
  193 + @order = 'more_recent'
194 if SEARCHES.keys.include?(@asset.to_sym) 194 if SEARCHES.keys.include?(@asset.to_sym)
195 - available_filters = asset_class(@asset)::SEARCH_FILTERS  
196 - @filter = params[:filter] if available_filters.include?(params[:filter]) 195 + available_orders = asset_class(@asset)::SEARCH_FILTERS[:order]
  196 + @order = params[:order] if available_orders.include?(params[:order])
197 end 197 end
198 end 198 end
199 199
@@ -217,7 +217,7 @@ class SearchController < PublicController @@ -217,7 +217,7 @@ class SearchController < PublicController
217 end 217 end
218 218
219 def full_text_search 219 def full_text_search
220 - @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @filter}) 220 + @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
221 end 221 end
222 222
223 private 223 private
app/helpers/search_helper.rb
  Diff comments   View file @82fbfb8
@@ -14,11 +14,23 @@ module SearchHelper @@ -14,11 +14,23 @@ module SearchHelper
14 :events, _('Events'), 14 :events, _('Events'),
15 ] 15 ]
16 16
17 - FILTER_TRANSLATION = {  
18 - 'more_popular' => _('More popular'),  
19 - 'more_active' => _('More active'),  
20 - 'more_recent' => _('More recent'),  
21 - 'more_comments' => _('More comments') 17 + FILTERS_TRANSLATIONS = {
  18 + :order => _('Order'),
  19 + :display => _('Display')
  20 + }
  21 +
  22 + FILTERS_OPTIONS_TRANSLATION = {
  23 + :order => {
  24 + 'more_popular' => _('More popular'),
  25 + 'more_active' => _('More active'),
  26 + 'more_recent' => _('More recent'),
  27 + 'more_comments' => _('More comments')
  28 + },
  29 + :display => {
  30 + 'map' => _('Map'),
  31 + 'full' => _('Full'),
  32 + 'compact' => _('Compact')
  33 + }
22 } 34 }
23 35
24 # FIXME remove it after search_controler refactored 36 # FIXME remove it after search_controler refactored
@@ -50,7 +62,7 @@ module SearchHelper @@ -50,7 +62,7 @@ module SearchHelper
50 end 62 end
51 63
52 def display?(asset, mode) 64 def display?(asset, mode)
53 - defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s) 65 + defined?(asset_class(asset)::SEARCH_FILTERS[:display]) && asset_class(asset)::SEARCH_FILTERS[:display].include?(mode.to_s)
54 end 66 end
55 67
56 def display_results(searches=nil, asset=nil) 68 def display_results(searches=nil, asset=nil)
@@ -87,32 +99,22 @@ module SearchHelper @@ -87,32 +99,22 @@ module SearchHelper
87 end 99 end
88 end 100 end
89 101
90 - def display_selector(asset, display, float = 'right')  
91 - display = nil if display.blank?  
92 - display ||= asset_class(asset).default_search_display  
93 - if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1  
94 - compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil  
95 - map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil  
96 - full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil  
97 - content_tag('div',  
98 - content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,  
99 - :class => 'search-customize-options'  
100 - ) 102 + def select_filter(name, options)
  103 + if options.size <= 1
  104 + return
  105 + else
  106 + options = options.map {|option| [FILTERS_OPTIONS_TRANSLATION[name][option], option]}
  107 + options = options_for_select(options, :selected => params[name])
  108 + select_tag(name, options)
101 end 109 end
102 end 110 end
103 111
104 - def filter_selector(asset, filter, float = 'right') 112 + def filters(asset)
105 klass = asset_class(asset) 113 klass = asset_class(asset)
106 - if klass::SEARCH_FILTERS.count > 1  
107 - options = options_for_select(klass::SEARCH_FILTERS.map {|f| [FILTER_TRANSLATION[f], f]}, filter)  
108 - url_params = url_for(params.merge(:filter => 'FILTER'))  
109 - onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"  
110 - select_field = select_tag(:filter, options, :onchange => onchange)  
111 - content_tag('div',  
112 - content_tag('strong', _('Filter')) + ': ' + select_field,  
113 - :class => "search-customize-options"  
114 - )  
115 - end 114 + content_tag('div', klass::SEARCH_FILTERS.map do |name, options|
  115 + select_filter(name, options)
  116 + end.join("\n"), :id => 'search-filters')
  117 + end
116 end 118 end
117 119
118 def filter_title(asset, filter) 120 def filter_title(asset, filter)
app/models/article.rb
  Diff comments   View file @82fbfb8
@@ -14,13 +14,10 @@ class Article &lt; ActiveRecord::Base @@ -14,13 +14,10 @@ class Article &lt; ActiveRecord::Base
14 :filename => 1, 14 :filename => 1,
15 } 15 }
16 16
17 - SEARCH_FILTERS = %w[  
18 - more_recent  
19 - more_popular  
20 - more_comments  
21 - ]  
22 -  
23 - SEARCH_DISPLAYS = %w[full] 17 + SEARCH_FILTERS = {
  18 + :order => %w[more_recent more_popular more_comments],
  19 + :display => %w[full]
  20 + }
24 21
25 def self.default_search_display 22 def self.default_search_display
26 'full' 23 'full'
app/models/enterprise.rb
  Diff comments   View file @82fbfb8
@@ -2,7 +2,11 @@ @@ -2,7 +2,11 @@
2 # only enterprises can offer products and services. 2 # only enterprises can offer products and services.
3 class Enterprise < Organization 3 class Enterprise < Organization
4 4
5 - SEARCH_DISPLAYS += %w[map full] 5 + SEARCH_FILTERS = {
  6 + :order => %w[more_recent more_popular more_active],
  7 + :display => %w[compact full map]
  8 + }
  9 +
6 10
7 def self.type_name 11 def self.type_name
8 _('Enterprise') 12 _('Enterprise')
app/models/organization.rb
  Diff comments   View file @82fbfb8
@@ -3,10 +3,11 @@ class Organization &lt; Profile @@ -3,10 +3,11 @@ class Organization &lt; Profile
3 3
4 attr_accessible :moderated_articles, :foundation_year, :contact_person, :acronym, :legal_form, :economic_activity, :management_information, :cnpj, :display_name, :enable_contact_us 4 attr_accessible :moderated_articles, :foundation_year, :contact_person, :acronym, :legal_form, :economic_activity, :management_information, :cnpj, :display_name, :enable_contact_us
5 5
6 - SEARCH_FILTERS += %w[  
7 - more_popular  
8 - more_active  
9 - ] 6 + SEARCH_FILTERS = {
  7 + :order => %w[more_recent more_popular more_active],
  8 + :display => %w[compact]
  9 + }
  10 +
10 11
11 settings_items :closed, :type => :boolean, :default => false 12 settings_items :closed, :type => :boolean, :default => false
12 def closed? 13 def closed?
app/models/person.rb
  Diff comments   View file @82fbfb8
@@ -3,10 +3,11 @@ class Person &lt; Profile @@ -3,10 +3,11 @@ class Person &lt; Profile
3 3
4 attr_accessible :organization, :contact_information, :sex, :birth_date 4 attr_accessible :organization, :contact_information, :sex, :birth_date
5 5
6 - SEARCH_FILTERS += %w[  
7 - more_popular  
8 - more_active  
9 - ] 6 + SEARCH_FILTERS = {
  7 + :order => %w[more_recent more_popular more_active],
  8 + :display => %w[compact]
  9 + }
  10 +
10 11
11 def self.type_name 12 def self.type_name
12 _('Person') 13 _('Person')
app/models/product.rb
  Diff comments   View file @82fbfb8
@@ -5,11 +5,10 @@ class Product &lt; ActiveRecord::Base @@ -5,11 +5,10 @@ class Product &lt; ActiveRecord::Base
5 :description => 1, 5 :description => 1,
6 } 6 }
7 7
8 - SEARCH_FILTERS = %w[  
9 - more_recent  
10 - ]  
11 -  
12 - SEARCH_DISPLAYS = %w[map full] 8 + SEARCH_FILTERS = {
  9 + :order => %w[more_recent],
  10 + :display => %w[map full]
  11 + }
13 12
14 attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers 13 attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description, :available, :qualifiers
15 14
app/models/profile.rb
  Diff comments   View file @82fbfb8
@@ -17,11 +17,10 @@ class Profile &lt; ActiveRecord::Base @@ -17,11 +17,10 @@ class Profile &lt; ActiveRecord::Base
17 :nickname => 2, 17 :nickname => 2,
18 } 18 }
19 19
20 - SEARCH_FILTERS = %w[  
21 - more_recent  
22 - ]  
23 -  
24 - SEARCH_DISPLAYS = %w[compact] 20 + SEARCH_FILTERS = {
  21 + :order => %w[more_recent],
  22 + :display => %w[compact]
  23 + }
25 24
26 def self.default_search_display 25 def self.default_search_display
27 'compact' 26 'compact'
app/views/search/_compact_profile.html.erb
  Diff comments   View file @82fbfb8
1 -<% filter_label = profile.send(@filter + '_label') %>  
2 -<% filter_label += show_date(profile.created_at) if @filter == 'more_recent' %> 1 +<% filter_label = profile.send(@order + '_label') %>
  2 +<% filter_label += show_date(profile.created_at) if @order == 'more_recent' %>
3 <li class="search-profile-item"> 3 <li class="search-profile-item">
4 <%= profile_image_link profile, :portrait, 'div', filter_label %> 4 <%= profile_image_link profile, :portrait, 'div', filter_label %>
5 </li> 5 </li>
app/views/search/_display_results.html.erb
  Diff comments   View file @82fbfb8
1 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>"> 1 <div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
2 - <% @order.each do |name| %> 2 + <% @assets.each do |name| %>
3 <% search = @searches[name] %> 3 <% search = @searches[name] %>
4 4
5 <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>"> 5 <div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
app/views/search/_full_enterprise.html.erb
  Diff comments   View file @82fbfb8
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="search-enterprise-item"> 2 <div class="search-enterprise-item">
3 <div class="search-enterprise-item-column-left"> 3 <div class="search-enterprise-item-column-left">
4 <%= profile_image_link enterprise, :portrait, 'div', 4 <%= profile_image_link enterprise, :portrait, 'div',
5 - @filter == 'more_recent' ? enterprise.send(@filter + '_label') + show_date(enterprise.created_at) : enterprise.send(@filter + '_label') %> 5 + @order == 'more_recent' ? enterprise.send(@order + '_label') + show_date(enterprise.created_at) : enterprise.send(@order + '_label') %>
6 </div> 6 </div>
7 <div class="search-enterprise-item-column-right"> 7 <div class="search-enterprise-item-column-right">
8 <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %> 8 <%= link_to_homepage(enterprise.name, enterprise.identifier, :class => "search-result-title") %>
test/functional/search_controller_test.rb
  Diff comments   View file @82fbfb8
@@ -558,7 +558,7 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -558,7 +558,7 @@ class SearchControllerTest &lt; ActionController::TestCase
558 assert_tag :a, '', :attributes => {:class => 'next_page'} 558 assert_tag :a, '', :attributes => {:class => 'next_page'}
559 end 559 end
560 560
561 - should 'list all communities filter by more active' do 561 + should 'list all communities sort by more active' do
562 person = fast_create(Person) 562 person = fast_create(Person)
563 c1 = create(Community, :name => 'Testing community 1') 563 c1 = create(Community, :name => 'Testing community 1')
564 c2 = create(Community, :name => 'Testing community 2') 564 c2 = create(Community, :name => 'Testing community 2')
@@ -567,21 +567,21 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -567,21 +567,21 @@ class SearchControllerTest &lt; ActionController::TestCase
567 create(ActionTracker::Record, :target => c1, :user => person, :created_at => Time.now, :verb => 'leave_scrap') 567 create(ActionTracker::Record, :target => c1, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
568 create(ActionTracker::Record, :target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap') 568 create(ActionTracker::Record, :target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
569 create(ActionTracker::Record, :target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap') 569 create(ActionTracker::Record, :target => c2, :user => person, :created_at => Time.now, :verb => 'leave_scrap')
570 - get :communities, :filter => 'more_active' 570 + get :communities, :order => 'more_active'
571 assert_equal [c2,c1,c3] , assigns(:searches)[:communities][:results] 571 assert_equal [c2,c1,c3] , assigns(:searches)[:communities][:results]
572 end 572 end
573 573
574 should "only include visible people in more_recent filter" do 574 should "only include visible people in more_recent filter" do
575 # assuming that all filters behave the same! 575 # assuming that all filters behave the same!
576 p1 = fast_create(Person, :visible => false) 576 p1 = fast_create(Person, :visible => false)
577 - get :people, :filter => 'more_recent' 577 + get :people, :order => 'more_recent'
578 assert_not_includes assigns(:searches)[:people][:results], p1 578 assert_not_includes assigns(:searches)[:people][:results], p1
579 end 579 end
580 580
581 should "only include visible communities in more_recent filter" do 581 should "only include visible communities in more_recent filter" do
582 # assuming that all filters behave the same! 582 # assuming that all filters behave the same!
583 p1 = fast_create(Community, :visible => false) 583 p1 = fast_create(Community, :visible => false)
584 - get :communities, :filter => 'more_recent' 584 + get :communities, :order=> 'more_recent'
585 assert_not_includes assigns(:searches)[:communities][:results], p1 585 assert_not_includes assigns(:searches)[:communities][:results], p1
586 end 586 end
587 587
@@ -648,7 +648,7 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -648,7 +648,7 @@ class SearchControllerTest &lt; ActionController::TestCase
648 art2 = create(Article, :name => 'review A', :profile_id => fast_create(Person).id, :created_at => Time.now) 648 art2 = create(Article, :name => 'review A', :profile_id => fast_create(Person).id, :created_at => Time.now)
649 art3 = create(Article, :name => 'review B', :profile_id => fast_create(Person).id, :created_at => Time.now-2.days) 649 art3 = create(Article, :name => 'review B', :profile_id => fast_create(Person).id, :created_at => Time.now-2.days)
650 650
651 - get :articles, :filter => :more_recent 651 + get :articles, :order=> :more_recent
652 652
653 assert_equal [art2, art1, art3], assigns(:searches)[:articles][:results] 653 assert_equal [art2, art1, art3], assigns(:searches)[:articles][:results]
654 end 654 end