Download as
Browse Code »

Commit 3b669432f54eb1dc7d37cd0e1bfa21f82a528c31

Authored by Rafael Martins
1 parent bed30d50
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

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,6 +15,8 @@ class Category < ActiveRecord::Base
15 15
16 acts_as_filesystem 16 acts_as_filesystem
17 17
  18 + acts_as_searchable :additional_fields => [{:name => {:boost => 2.0}}]
  19 +
18 has_many :article_categorizations 20 has_many :article_categorizations
19 has_many :articles, :through => :article_categorizations 21 has_many :articles, :through => :article_categorizations
20 has_many :comments, :through => :articles 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,9 +24,9 @@ module SetProfileRegionFromCityState
24 24
25 def region_from_city_and_state 25 def region_from_city_and_state
26 if @change_region 26 if @change_region
27 - s = State.find_by_name self.state 27 + s = State.find_by_contents(self.state)[:results].first
28 if s 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 self.region = c 30 self.region = c
31 end 31 end
32 end 32 end