aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/journey_patterns_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2015-01-15 17:48:11 +0100
committerLuc Donnet2015-01-15 17:48:11 +0100
commit19e95457a20116f5944fe2d7bb07675b564bc930 (patch)
tree231ad126f79522e7e5e796e49a24b042844599d8 /app/controllers/journey_patterns_controller.rb
parentc89c3508eb953e79165ba61aee878db8e4d15ff5 (diff)
downloadchouette-core-19e95457a20116f5944fe2d7bb07675b564bc930.tar.bz2
Reactivate specs for journey_pattern and stop_point
Diffstat (limited to 'app/controllers/journey_patterns_controller.rb')
-rw-r--r--app/controllers/journey_patterns_controller.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb
index 6f33fd0de..f4baa3b41 100644
--- a/app/controllers/journey_patterns_controller.rb
+++ b/app/controllers/journey_patterns_controller.rb
@@ -38,20 +38,23 @@ 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
+ object.delete
end
-
def collection
@q = route.journey_patterns.search( params[:q])
@journey_patterns ||= @q.result(:distinct => true).order(:name)
end
+
+ private
+
def journey_pattern_params
- params.require(journey_pattern).permit( :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points )
+ params.require(:journey_pattern).permit( :route_id, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name, :departure_stop_point_id, :arrival_stop_point_id, :stop_point_ids, :stop_points )
end
end