Download as
Browse Code »

Commit 3b669432f54eb1dc7d37cd0e1bfa21f82a528c31

Authored by Rafael Martins
1 parent bed30d50
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Fix for 'set_profile_region_from_city_state' when state is not found 

Solr boost for Category name field
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
app/models/category.rb
  Diff comments   View file @3b66943
... ... @@ -15,6 +15,8 @@ class Category < ActiveRecord::Base
15 15  
16 16 acts_as_filesystem
17 17  
  18 + acts_as_searchable :additional_fields => [{:name => {:boost => 2.0}}]
  19 +
18 20 has_many :article_categorizations
19 21 has_many :articles, :through => :article_categorizations
20 22 has_many :comments, :through => :articles
... ...
lib/set_profile_region_from_city_state.rb
  Diff comments   View file @3b66943
... ... @@ -24,9 +24,9 @@ module SetProfileRegionFromCityState
24 24  
25 25 def region_from_city_and_state
26 26 if @change_region
27   - s = State.find_by_name self.state
  27 + s = State.find_by_contents(self.state)[:results].first
28 28 if s
29   - c = s.children.find_by_name self.city
  29 + c = City.find_by_contents(self.city, {}, :filter_queries => ["parent_id:#{s.id}"])[:results].first
30 30 self.region = c
31 31 end
32 32 end
... ...