diff options
| -rw-r--r-- | app/assets/javascripts/select2.coffee | 3 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_filters.html.slim | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/select2.coffee b/app/assets/javascripts/select2.coffee index f34b5d5ce..2ff5e198e 100644 --- a/app/assets/javascripts/select2.coffee +++ b/app/assets/javascripts/select2.coffee @@ -28,7 +28,8 @@ bind_select2_ajax = (el, cfg = {}) -> escapeMarkup: (markup) -> markup - if _this.data('initvalue') + initValue = _this.data('initvalue') + if initValue && initValue.id && initValue.text cfg["initSelection"] = (item, callback) -> callback(_this.data('initvalue')) bind_select2(el, cfg) diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim index 8cd17ca0a..49e6317f7 100644 --- a/app/views/referential_vehicle_journeys/_filters.html.slim +++ b/app/views/referential_vehicle_journeys/_filters.html.slim @@ -23,6 +23,7 @@ .form-inline.filter_menu = f.input :route_line_id_eq, as: :select, + collection: [], include_blank: t(".all"), input_html: { \ data: { \ |