diff options
| author | Luc Donnet | 2017-07-31 10:52:14 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-07-31 10:52:14 +0200 |
| commit | 902d5961f1dcdce60b44efe4eaa18c9717ab24ed (patch) | |
| tree | 36de5c424018e389e29c9633561d1d41cc5015ce /app | |
| parent | 1f02f27958776bfe3a8f3793b324149c083fc9fe (diff) | |
| parent | b08feca2b824466cd2ecc9ebde005682b0080068 (diff) | |
| download | chouette-core-902d5961f1dcdce60b44efe4eaa18c9717ab24ed.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 1 | ||||
| -rw-r--r-- | app/models/chouette/vehicle_journey.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js index 56244e9a6..0183aac43 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js @@ -38,7 +38,6 @@ class BSelect4 extends React.Component{ }; }, processResults: function(data, params) { - // console.log(data) return { results: data.map( item => _.assign( diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb index bc2713973..5e86a4897 100644 --- a/app/models/chouette/vehicle_journey.rb +++ b/app/models/chouette/vehicle_journey.rb @@ -23,11 +23,11 @@ module Chouette validates_presence_of :route validates_presence_of :journey_pattern - validates :vehicle_journey_at_stops, + # validates :vehicle_journey_at_stops, # Validation temporarily removed for day offsets # :vjas_departure_time_must_be_before_next_stop_arrival_time, - vehicle_journey_at_stops_are_in_increasing_time_order: true + # vehicle_journey_at_stops_are_in_increasing_time_order: false validates_presence_of :number has_many :vehicle_journey_at_stops, -> { includes(:stop_point).order("stop_points.position") }, :dependent => :destroy |