From 1850e7582cbb980cb409d5bc15a6e6eda133b14d Mon Sep 17 00:00:00 2001
From: Isaac Canan <isaac@intelletto.com.br>
Date: Thu, 1 Sep 2011 10:50:56 -0300
Subject: [PATCH] [geolocalization] Fix to validate city hierarchy per countries

---
 app/models/national_region.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/national_region.rb b/app/models/national_region.rb
index 0b50079..b82b035 100644
--- a/app/models/national_region.rb
+++ b/app/models/national_region.rb
@@ -15,6 +15,7 @@ class NationalRegion < ActiveRecord::Base
       adtional_contions = " AND nr.name = :state "
     end
 
+
     conditions  = ["national_regions.name #{operator} :name AND
                     national_regions.national_region_type_id = :type" + adtional_contions,
                   {:name => city_name ,
@@ -54,7 +55,11 @@ class NationalRegion < ActiveRecord::Base
 
   def self.validate!(city, state, country)
 
-    if(country  == "BR")
+    coutry_region = NationalRegion.find_by_national_region_code(country,
+                                                :conditions => ["national_region_type_id = :type",
+                                                               {:type => NationalRegionType::COUNTRY}])
+
+    if(coutry_region)
 
       nregion = NationalRegion.search_city(city, false, state);
 
--
libgit2 0.21.2