diff options
| author | cedricnjanga | 2017-08-28 18:06:58 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-08-28 18:18:51 +0200 |
| commit | 559dfcd5473cd106ef98826f19df22e2cbb2a4c5 (patch) | |
| tree | d938285b259ab6c92cbb2f39f1ca5bcd57c703f5 | |
| parent | 43c355dc9c5e60398977908109135c6017338537 (diff) | |
| download | chouette-core-559dfcd5473cd106ef98826f19df22e2cbb2a4c5.tar.bz2 | |
Refs #4319 fix timetable autocomplete
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js | 7 | ||||
| -rw-r--r-- | app/controllers/autocomplete_time_tables_controller.rb | 2 |
2 files changed, 7 insertions, 2 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 0183aac43..0d8e54b1e 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 @@ -33,8 +33,13 @@ class BSelect4 extends React.Component{ dataType: 'json', delay: '500', data: function(params) { + let newParmas = params.term.split(" ") return { - q: {short_id_or_comment_cont: params.term}, + q: { + objectid_end_any: newParmas, + comment_cont_any: newParmas, + m: 'or' + } }; }, processResults: function(data, params) { diff --git a/app/controllers/autocomplete_time_tables_controller.rb b/app/controllers/autocomplete_time_tables_controller.rb index e5d2b41ae..b3add6eca 100644 --- a/app/controllers/autocomplete_time_tables_controller.rb +++ b/app/controllers/autocomplete_time_tables_controller.rb @@ -15,7 +15,7 @@ class AutocompleteTimeTablesController < InheritedResources::Base protected def select_time_tables - scope = referential.time_tables.where("time_tables.id != ?", params[:source_id]) + scope = params[:source_id] ? referential.time_tables.where("time_tables.id != ?", params[:source_id]) : referential.time_tables if params[:route_id] scope = scope.joins(vehicle_journeys: :route).where( "routes.id IN (#{params[:route_id]}) AND time_tables.id != #{params[:time_table_id]}") end |