Merge pull request #282 from af83/5824-autocomplete-stop-areas-scope

5824 autocomplete stop areas scope

2 files changed, 1 insertions, 5 deletions

diff --git a/app/controllers/autocomplete_stop_areas_controller.rb b/app/controllers/autocomplete_stop_areas_controller.rb
index d82fa316a..79154a6e0 100644
--- a/app/controllers/autocomplete_stop_areas_controller.rb
+++ b/app/controllers/autocomplete_stop_areas_controller.rb
@@ -21,7 +21,7 @@ class AutocompleteStopAreasController < ChouetteController
       scope = StopAreaPolicy::Scope.new(current_user, scope).search_scope(search_scope)
     end
     args = [].tap{|arg| 4.times{arg << "%#{params[:q]}%"}}
-    @stop_areas = scope.where("unaccent(name) ILIKE unaccent(?) OR unaccent(city_name) ILIKE unaccent(?) OR registration_number ILIKE ? OR objectid ILIKE ?", *args).limit(50)
+    @stop_areas = scope.where("unaccent(stop_areas.name) ILIKE unaccent(?) OR unaccent(stop_areas.city_name) ILIKE unaccent(?) OR stop_areas.registration_number ILIKE ? OR stop_areas.objectid ILIKE ?", *args).limit(50)
     @stop_areas
   end
 
diff --git a/app/models/referential.rb b/app/models/referential.rb
index baaa354da..f64db4ebf 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -153,10 +153,6 @@ class Referential < ActiveRecord::Base
     end
   end
 
-  def stop_areas
-    Chouette::StopArea.all
-  end
-
   def access_points
     Chouette::AccessPoint.all
   end