diff options
| author | Luc Donnet | 2018-01-11 17:18:50 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-11 17:18:50 +0100 |
| commit | 9ed11e14f45724b22d4a2f417e21ebb5be6d5554 (patch) | |
| tree | 5be0bb52e08127f0ad4d5b9253112916ab16608c | |
| parent | 19e1f5fb193b7206424ebe32535468408a4b7ddf (diff) | |
| parent | 93ca7a94e8cb7845e36fab4eb953bf9f4461551d (diff) | |
| download | chouette-core-9ed11e14f45724b22d4a2f417e21ebb5be6d5554.tar.bz2 | |
Merge pull request #228 from af83/fix-vj-creation-with-full-schedule
Fix VJ creation with full schedule
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/api/v1/journey_patterns/show.rabl | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 565cccec8..e3e067782 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -186,6 +186,8 @@ class VehicleJourneysController < ChouetteController published_name: item.published_name, object_id: item.objectid, short_id: item.get_objectid.short_id, + full_schedule: item.full_schedule?, + costs: item.costs, stop_area_short_descriptions: item.stop_areas.map do |stop| { stop_area_short_description: { diff --git a/app/views/api/v1/journey_patterns/show.rabl b/app/views/api/v1/journey_patterns/show.rabl index cdda2d1cd..aac66b6f3 100644 --- a/app/views/api/v1/journey_patterns/show.rabl +++ b/app/views/api/v1/journey_patterns/show.rabl @@ -12,6 +12,7 @@ end if has_feature? :costs_in_journey_patterns attribute :costs end + node(:route_short_description) do |journey_pattern| partial("api/v1/routes/short_description", :object => journey_pattern.route) end |
