update ninoxe and fix objectid input on form

2 files changed, 6 insertions, 13 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8cde89db0..3cb217b9c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,4 +12,10 @@ class ApplicationController < ActionController::Base
   def begin_of_association_chain
     current_organisation
   end
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_out_path_for(resource_or_scope)
+    new_user_session_path
+  end
+  
 end
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index a7794fcb2..e83c3c3ff 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -30,19 +30,6 @@ class VehicleJourneysController < ChouetteController
     update!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times'))
   end
 
-  def edit
-    vehicle_journey.update_journey_pattern( vehicle_journey.journey_pattern)
-
-    edit!
-  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
   
   alias_method :vehicle_journey, :resource