Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

1 files changed, 9 insertions, 2 deletions

diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 084f34b03..69b518d3f 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -2,6 +2,7 @@ class JourneyPatternsController < ChouetteController
   defaults :resource_class => Chouette::JourneyPattern
 
   respond_to :html
+  respond_to :json, :only => :index
   respond_to :js, :only => [:new_vehicle_journey, :show]
   respond_to :kml, :only => :show
 
@@ -14,7 +15,7 @@ class JourneyPatternsController < ChouetteController
   alias_method :route, :parent
   alias_method :journey_pattern, :resource
 
-  def index     
+  def index
     index! do |format|
       format.html { redirect_to referential_line_route_path(@referential,@line,@route) }
     end
@@ -56,10 +57,16 @@ class JourneyPatternsController < ChouetteController
     @vehicle_journey.update_journey_pattern(resource)
     render "vehicle_journeys/select_journey_pattern"
   end
-  # overwrite inherited resources to use delete instead of destroy 
+  # overwrite inherited resources to use delete instead of destroy
   # foreign keys will propagate deletion)
   def destroy_resource(object)
         object.delete
   end
 
+
+  def collection
+    @q = route.journey_patterns.search( params[:q])
+    @journey_patterns ||= @q.result(:distinct => true).order(:name)
+  end
+
 end