aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorLuc Donnet2012-04-12 16:03:51 +0200
committerLuc Donnet2012-04-12 16:03:51 +0200
commitef16bc107b87f2157e9c38a02da5bc085ae43f4f (patch)
tree8561f9068e9ec740b0c318b7d44f37c810a1b2ca /app/controllers
parent5c74351949a3c243723347b6bf525036a8dd6e91 (diff)
downloadchouette-core-ef16bc107b87f2157e9c38a02da5bc085ae43f4f.tar.bz2
Fix css for index, update ninoxe and stop areas loading
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/stop_areas_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 60600e2b4..77055853d 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -43,7 +43,7 @@ class StopAreasController < ChouetteController
alias_method :stop_area, :resource
def collection
- @q = end_of_association_chain.search(params[:q])
+ @q = parent.present? ? parent.stop_areas.search(params[:q]) : referential.stop_areas.search(params[:q])
@stop_areas ||=
begin
stop_areas = @q.result(:distinct => true).order(:name)