Download as
Browse Code »

Commit 1850e7582cbb980cb409d5bc15a6e6eda133b14d

Authored by Isaac Canan
Committed by Rafael Martins
1 parent 83607363
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

[geolocalization] 

Fix to validate city hierarchy per countries
Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
app/models/national_region.rb
  Diff comments   View file @1850e75
... ... @@ -15,6 +15,7 @@ class NationalRegion < ActiveRecord::Base
15 15 adtional_contions = " AND nr.name = :state "
16 16 end
17 17  
  18 +
18 19 conditions = ["national_regions.name #{operator} :name AND
19 20 national_regions.national_region_type_id = :type" + adtional_contions,
20 21 {:name => city_name ,
... ... @@ -54,7 +55,11 @@ class NationalRegion < ActiveRecord::Base
54 55  
55 56 def self.validate!(city, state, country)
56 57  
57   - if(country == "BR")
  58 + coutry_region = NationalRegion.find_by_national_region_code(country,
  59 + :conditions => ["national_region_type_id = :type",
  60 + {:type => NationalRegionType::COUNTRY}])
  61 +
  62 + if(coutry_region)
58 63  
59 64 nregion = NationalRegion.search_city(city, false, state);
60 65  
... ...