diff options
| author | cedricnjanga | 2017-07-13 15:33:44 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-07-13 15:37:01 +0200 |
| commit | 6af57dbc8b61c04db99e87eb5fabe9386e5ce94a (patch) | |
| tree | 14daf56fa99fdd7b5e33059173cd2eccebb2f6ab /app | |
| parent | 5c0b381591169d969f99f87ebaaedaff6965deb7 (diff) | |
| download | chouette-core-6af57dbc8b61c04db99e87eb5fabe9386e5ce94a.tar.bz2 | |
Add ternary to avoid error in replace methods
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/itineraries/index.js | 6 | ||||
| -rw-r--r-- | app/models/chouette/time_table.rb | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 2f1e9d180..a8f3048fa 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -25,13 +25,13 @@ const getInitialState = () => { stoppoint_id: v.stoppoint_id, stoparea_id: v.stoparea_id, user_objectid: v.user_objectid, - short_name: v.short_name.replace("'", "\'"), + short_name: v.short_name ? v.short_name.replace("'", "\'") : '', 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 |