aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLuc Donnet2016-11-03 11:00:10 +0100
committerLuc Donnet2016-11-03 11:00:10 +0100
commit7212356ab15ea1807c28a8dce4a11290d47facac (patch)
tree1249db22b6d77f43458da62bada527f89d51b3d4 /app
parent8db302e6b40412d7db815e815e43581dc2fe1d9e (diff)
downloadchouette-core-7212356ab15ea1807c28a8dce4a11290d47facac.tar.bz2
Fix autocomplete stop_areas loading
Diffstat (limited to 'app')
-rw-r--r--app/controllers/autocomplete_stop_areas_controller.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/autocomplete_stop_areas_controller.rb b/app/controllers/autocomplete_stop_areas_controller.rb
index cd3521f6a..1e43f3968 100644
--- a/app/controllers/autocomplete_stop_areas_controller.rb
+++ b/app/controllers/autocomplete_stop_areas_controller.rb
@@ -1,15 +1,15 @@
class AutocompleteStopAreasController < InheritedResources::Base
respond_to :json, :only => [:index, :children, :parent, :physicals]
-
+
before_action :switch_referential
-
+
def switch_referential
Apartment::Tenant.switch!(referential.slug)
end
def referential
- @referential ||= current_organisation.referentials.find params[:referential_id]
- end
+ @referential ||= current_organisation.referentials.find params[:referential_id]
+ end
protected
@@ -26,7 +26,7 @@ class AutocompleteStopAreasController < InheritedResources::Base
else
result = referential.stop_areas
end
- @stop_areas = result.select{ |p| [p.name, p.registration_number, p.objectid].grep(/#{params[:q]}/i).any? }
+ @stop_areas = result.where("name LIKE '%#{params[:q]}%' OR registration_number LIKE '%#{params[:q]}%' OR objectid LIKE '%#{params[:q]}%' ").limit(50)
@stop_areas
end
@@ -51,4 +51,3 @@ class AutocompleteStopAreasController < InheritedResources::Base
end
end
-