diff options
| -rw-r--r-- | app/assets/javascripts/es6_browserified/itineraries/index.js | 4 | ||||
| -rw-r--r-- | app/models/chouette/time_table.rb | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 2f1e9d180..60963c14a 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -29,9 +29,9 @@ const getInitialState = () => { area_type: v.area_type, index: i, edit: false, - city_name: v.city_name.replace("'", "\'"), + city_name: v.city_name ? v.city_name.replace("'", "\'") : '', zip_code: v.zip_code, - name: v.name.replace("'", "\'"), + name: v.name : v.name.replace("'", "\'") || '', registration_number: v.registration_number, text: fancyText, for_boarding: v.for_boarding || "normal", diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index a328965a1..d907d797e 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -21,12 +21,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord belongs_to :created_from, class_name: 'Chouette::TimeTable' scope :overlapping, -> (date_start, date_end) do - joins - (' - LEFT OUTER JOIN "time_table_dates" ON "time_table_dates"."time_table_id" = "time_tables"."id" - LEFT OUTER JOIN "time_table_periods" ON "time_table_periods"."time_table_id" = "time_tables"."id" - ') - .where('(period_start <= :end and period_end >= :start) OR (date BETWEEN :start AND :end)', {start: date_start, end: date_end}) + joins(:periods).where('(period_start, period_end) OVERLAPS (?, ?)', date_start, date_end) end after_save :save_shortcuts |