diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/journey_patterns_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/lines_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/routes_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 6 |
4 files changed, 21 insertions, 0 deletions
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 377ddf7c8..0274b9b71 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -35,5 +35,10 @@ 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 + # foreign keys will propagate deletion) + def destroy_resource(object) + object.delete + end end diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb index c8655908d..854b88ae5 100644 --- a/app/controllers/lines_controller.rb +++ b/app/controllers/lines_controller.rb @@ -14,6 +14,10 @@ class LinesController < ChouetteController show! end + def destroy_resource(object) + object.delete + end + def destroy_all objects = get_collection_ivar || set_collection_ivar(end_of_association_chain.where(:id => params[:ids])) diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index 078694ea0..7b5e096db 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -21,6 +21,12 @@ class RoutesController < ChouetteController show! end + # overwrite inherited resources to use delete instead of destroy + # foreign keys will propagate deletion) + def destroy_resource(object) + object.delete + end + def destroy destroy! do |success, failure| success.html { redirect_to referential_line_path(@referential,@line) } diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index e83c3c3ff..1aec533c1 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -30,6 +30,12 @@ class VehicleJourneysController < ChouetteController update!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times')) end + # overwrite inherited resources to use delete instead of destroy + # foreign keys will propagate deletion) + def destroy_resource(object) + object.delete + end + protected alias_method :vehicle_journey, :resource |
