fix Refs #77

2 files changed, 21 insertions, 2 deletions

diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 1ec15f7e8..d8611d6f9 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 :js, :only => [:new_vehicle_journey]
 
   belongs_to :referential do
     belongs_to :line, :parent_class => Chouette::Line do
@@ -16,4 +17,11 @@ class JourneyPatternsController < ChouetteController
     @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"
+  end
 end
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index d8dca65b5..9248f88de 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -1,7 +1,7 @@
 class VehicleJourneysController < ChouetteController
   defaults :resource_class => Chouette::VehicleJourney
 
-  respond_to :js, :only => [:select_journey_pattern, :edit]
+  respond_to :js, :only => [:select_journey_pattern, :edit, :new]
 
   belongs_to :referential do
     belongs_to :line, :parent_class => Chouette::Line do
@@ -18,8 +18,19 @@ class VehicleJourneysController < ChouetteController
     end
   end
 
+  def create
+    create!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times'))
+  end
+
   def update
-    update!(:alert => "Hey pb")
+    update!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times'))
+  end
+
+  def new
+    @vehicle_journey = Chouette::VehicleJourney.new( :route => @route)
+    @vehicle_journey.update_journey_pattern( parent.journey_patterns.first) if parent.journey_patterns.first
+
+    new!
   end
 
   protected