Download as
Browse Code »

Commit c282a3dec9b67fab8d65736256ed4032254e67aa

Authored by Larissa Reis
1 parent 00d5c1ac
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

invite-members: uses the default find_by_content infra-structure 

  Now search_friend uses the default infra-structure
  ApplicationController#find_by_contents.

  Because of that, this patch adds joins and specific search fields to
  find_by_contents.
Showing 3 changed files with 26 additions and 11 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @c282a3d
... ... @@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
181 181 private
182 182  
183 183 def fallback_find_by_contents(asset, scope, query, paginate_options, options)
184   - scope = scope.like_search(query) unless query.blank?
  184 + scope = scope.like_search(query, options) unless query.blank?
185 185 scope = scope.send(options[:filter]) unless options[:filter].blank?
186 186 {:results => scope.paginate(paginate_options)}
187 187 end
... ...
app/controllers/public/invite_controller.rb
  Diff comments   View file @c282a3d
... ... @@ -78,10 +78,7 @@ class InviteController < PublicController
78 78  
79 79 def search_friend
80 80 fields = %w[name identifier email] + plugins_options.map {|field| field[:field].to_s }
81   - values = ["%#{params['q']}%"] * fields.count
82   - render :text => environment.people.find(:all, :joins => ['INNER JOIN users ON profiles.user_id=users.id'], :conditions => [fields.map {|field| "LOWER(#{field}) LIKE ?"}.join(' OR '), *values]).
83   - select {|person| !profile.members.include?(person) }.
84   - map {|person| {:id => person.id, :name => person.name} }.to_json
  81 + render :text => find_by_contents(:people, environment.people, params['q'], {:page => 1}, {:fields => fields, :joins => :user})[:results].select {|person| !profile.members.include?(person) }.map {|person| {:id => person.id, :name => person.name} }.to_json
85 82 end
86 83  
87 84 protected
... ...
lib/noosfero/core_ext/active_record.rb
  Diff comments   View file @c282a3d
... ... @@ -13,14 +13,32 @@ class ActiveRecord::Base
13 13 key.join('/')
14 14 end
15 15  
16   - def self.like_search(query)
17   - if defined?(self::SEARCHABLE_FIELDS)
18   - fields = self::SEARCHABLE_FIELDS.keys.map(&:to_s) & column_names
  16 + def self.like_search(query, options={})
  17 + if defined?(self::SEARCHABLE_FIELDS) || options[:fields].present?
  18 + fields_per_table = {}
  19 + fields_per_table[table_name] = (options[:fields].present? ? options[:fields] : self::SEARCHABLE_FIELDS.keys.map(&:to_s)) & column_names
  20 +
  21 + if options[:joins].present?
  22 + join_asset = options[:joins].to_s.classify.constantize
  23 + if defined?(join_asset::SEARCHABLE_FIELDS) || options[:fields].present?
  24 + fields_per_table[join_asset.table_name] = (options[:fields].present? ? options[:fields] : join_asset::SEARCHABLE_FIELDS.keys.map(&:to_s)) & join_asset.column_names
  25 + end
  26 + end
  27 +
19 28 query = query.downcase.strip
20   - conditions = fields.map do |field|
21   - "lower(#{table_name}.#{field}) LIKE '%#{query}%'"
  29 + fields_per_table.delete_if { |table,fields| fields.blank? }
  30 + conditions = fields_per_table.map do |table,fields|
  31 + fields.map do |field|
  32 + "lower(#{table}.#{field}) LIKE '%#{query}%'"
  33 + end.join(' OR ')
22 34 end.join(' OR ')
23   - where(conditions)
  35 +
  36 + if options[:joins].present?
  37 + joins(options[:joins]).where(conditions)
  38 + else
  39 + where(conditions)
  40 + end
  41 +
24 42 else
25 43 raise "No searchable fields defined for #{self.name}"
26 44 end
... ...