aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-02-02 17:57:01 +0100
committercedricnjanga2018-02-07 07:14:04 -0800
commita5c48d95d78cf611985b0f3dc0d36c070d9f601e (patch)
treebca3935f80d9f1fa9e9d814386272672d09de920
parent60176816df7bf7291c1df23c52809816d6a8057f (diff)
downloadchouette-core-a5c48d95d78cf611985b0f3dc0d36c070d9f601e.tar.bz2
Revert "Prevent problem with StopArea#kind. Refs #5817"
This reverts commit c2bc391ee91cac70e726d188be97dd2323df0df2. Thanks to 76abdbd66c16e6e1233685a5fa28a42cba5580d9, this temporary fix can be reverted. We don't actually need `kind` selected here, it was only added to appease the auto-initialisation of `kind` in `StopArea`. Now that we don't set a default value for `kind` on initialisation, we can remove it from this `select`.
-rw-r--r--app/views/referential_vehicle_journeys/_filters.html.slim2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/referential_vehicle_journeys/_filters.html.slim b/app/views/referential_vehicle_journeys/_filters.html.slim
index bd8245e39..3104e3a71 100644
--- a/app/views/referential_vehicle_journeys/_filters.html.slim
+++ b/app/views/referential_vehicle_journeys/_filters.html.slim
@@ -42,7 +42,7 @@
= f.input :published_journey_name_lteq, label: false, wrapper_html: { class: 'w45'}
.form-group.togglable class=filter_item_class(params[:q], :stop_area_ids)
= f.label Chouette::StopArea.model_name.human.pluralize, required: false, class: 'control-label'
- = f.input :stop_area_ids, collection: @all_stop_areas.select(:id, :name, :kind).order(name: :asc), checked: params[:q] && params[:q][:stop_area_ids], as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}, multiple: true
+ = f.input :stop_area_ids, collection: @all_stop_areas.select(:id, :name).order(name: :asc), checked: params[:q] && params[:q][:stop_area_ids], as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + l.name + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}, multiple: true
.form-group.togglable class=filter_item_class(params[:q], :purchase_window)
= f.label Chouette::VehicleJourney.human_attribute_name(:purchase_window), class: 'control-label'
.filter_menu