diff options
| -rw-r--r-- | app/controllers/journey_patterns_collections_controller.rb | 25 | ||||
| -rw-r--r-- | app/controllers/journey_patterns_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/journey_patterns/index.rabl | 4 | ||||
| -rw-r--r-- | app/views/journey_patterns/show.rabl | 20 | ||||
| -rw-r--r-- | app/views/journey_patterns_collections/show.html.slim | 1 | ||||
| -rw-r--r-- | app/views/journey_patterns_collections/show.rabl | 3 | ||||
| -rw-r--r-- | config/routes.rb | 3 | ||||
| -rw-r--r-- | spec/controllers/journey_patterns_collections_controller_spec.rb | 5 |
8 files changed, 35 insertions, 31 deletions
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb new file mode 100644 index 000000000..c4dc92584 --- /dev/null +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -0,0 +1,25 @@ +class JourneyPatternsCollectionsController < ChouetteController + defaults :resource_class => Chouette::JourneyPattern + + respond_to :html + respond_to :json + + belongs_to :referential do + belongs_to :line, :parent_class => Chouette::Line do + belongs_to :route, :parent_class => Chouette::Route + end + end + alias_method :route, :parent + + def show + @q = route.journey_patterns.search(params[:q]) + @journey_patterns ||= @q.result(:distinct => true).order(:name) + end + + def update + ap "-----Call to #{params[:action]} from #{params[:controller]}" + ap '------------------------------------------------------------' + ap params + ap '------------------------------------------------------------' + end +end diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 1e2d2f191..326c5397a 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -19,11 +19,6 @@ class JourneyPatternsController < ChouetteController object.special_update end - def bulk_update - ap "--------call to bulk_update action ------------" - ap params - end - def show @map = JourneyPatternMap.new(journey_pattern).with_helpers(self) @stop_points = journey_pattern.stop_points.paginate(:page => params[:page]) diff --git a/app/views/journey_patterns/index.rabl b/app/views/journey_patterns/index.rabl deleted file mode 100644 index fc4175e2b..000000000 --- a/app/views/journey_patterns/index.rabl +++ /dev/null @@ -1,4 +0,0 @@ -collection @journey_patterns - -extends "journey_patterns/show" - diff --git a/app/views/journey_patterns/show.rabl b/app/views/journey_patterns/show.rabl deleted file mode 100644 index b1eaf2376..000000000 --- a/app/views/journey_patterns/show.rabl +++ /dev/null @@ -1,20 +0,0 @@ -object @journey_pattern -extends "api/v1/trident_objects/show" - -[:name, :published_name, :registration_number, :comment].each do |attr| - attributes attr, :unless => lambda { |m| m.send( attr).nil?} -end - -node(:route_short_description) do |journey_pattern| - partial("api/v1/routes/short_description", :object => journey_pattern.route) -end - -node(:vehicle_journey_object_ids) do |journey_pattern| - journey_pattern.vehicle_journeys.map(&:objectid) -end unless root_object.vehicle_journeys.empty? - -child :stop_points => :stop_area_short_descriptions do |stop_points| - node do |stop_point| - partial("api/v1/stop_areas/short_description", :object => stop_point.stop_area) - end -end unless root_object.stop_points.empty? diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim new file mode 100644 index 000000000..2c4a38bd6 --- /dev/null +++ b/app/views/journey_patterns_collections/show.html.slim @@ -0,0 +1 @@ += javascript_include_tag 'es6_browserified/journey_patterns/index.js' diff --git a/app/views/journey_patterns_collections/show.rabl b/app/views/journey_patterns_collections/show.rabl new file mode 100644 index 000000000..c241a9c0e --- /dev/null +++ b/app/views/journey_patterns_collections/show.rabl @@ -0,0 +1,3 @@ +collection @journey_patterns +extends "api/v1/journey_patterns/show" + diff --git a/config/routes.rb b/config/routes.rb index f2a04c4b8..3f25dee4d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -99,10 +99,9 @@ ChouetteIhm::Application.routes.draw do get 'edit_boarding_alighting' put 'save_boarding_alighting' end + resource :journey_patterns_collection, :only => [:show, :update] resources :journey_patterns do get 'new_vehicle_journey', on: :member - post 'bulk_update', on: :collection - resource :route_sections_selector, path: 'sections' do post 'selection' end diff --git a/spec/controllers/journey_patterns_collections_controller_spec.rb b/spec/controllers/journey_patterns_collections_controller_spec.rb new file mode 100644 index 000000000..888281036 --- /dev/null +++ b/spec/controllers/journey_patterns_collections_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe JourneyPatternsCollectionsController, :type => :controller do + +end |