diff options
| author | Michel Etienne | 2012-06-29 10:11:36 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-06-29 10:11:36 +0200 |
| commit | 8ccb51a3fd3907388ccaa02652a50af5e2ac08e0 (patch) | |
| tree | 5144f13f0b6b4fbeb2fcad35a8d9f14f03a8331f /app/controllers/journey_patterns_controller.rb | |
| parent | 56de2324949f9035ccb30f0ddbf86a2b6b3aebc3 (diff) | |
| parent | 7159c4509e4b9e28786165339c9be1f465419b92 (diff) | |
| download | chouette-core-8ccb51a3fd3907388ccaa02652a50af5e2ac08e0.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'app/controllers/journey_patterns_controller.rb')
| -rw-r--r-- | app/controllers/journey_patterns_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index d8611d6f9..fe1b601d4 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -13,13 +13,12 @@ class JourneyPatternsController < ChouetteController alias_method :route, :parent def show - #@map = RouteMap.new referential, route + #@map = RouteMap.new(route).with_helpers(self) @stop_points = resource.stop_points.paginate(:page => params[:page], :per_page => 10) show! end def new_vehicle_journey - puts resource.inspect @vehicle_journey = Chouette::VehicleJourney.new(:route_id => route.id) @vehicle_journey.update_journey_pattern(resource) render "vehicle_journeys/select_journey_pattern" |
