diff options
| author | cedricnjanga | 2017-10-03 14:26:59 +0200 |
|---|---|---|
| committer | cedricnjanga | 2017-10-03 15:09:20 +0200 |
| commit | 7775030c3f84e0673bbf68e7a60a3ed4798f6b91 (patch) | |
| tree | 2abc8734fb1115efd4ef146d528eb042a2910387 | |
| parent | 44e76bedd60938f32c7765cab1e1a19deb96d80c (diff) | |
| download | chouette-core-7775030c3f84e0673bbf68e7a60a3ed4798f6b91.tar.bz2 | |
Refs 4665 Update time_table for to adapt to ransack date filter concern
| -rw-r--r-- | app/controllers/concerns/ransack_date_filter.rb | 16 | ||||
| -rw-r--r-- | app/views/time_tables/_filter.html.slim | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/controllers/concerns/ransack_date_filter.rb b/app/controllers/concerns/ransack_date_filter.rb index 20ab764b3..361c26c98 100644 --- a/app/controllers/concerns/ransack_date_filter.rb +++ b/app/controllers/concerns/ransack_date_filter.rb @@ -13,14 +13,14 @@ module RansackDateFilter start_date << params[:q][@@date_param]["start_date(#{key}i)"].to_i end_date << params[:q][@@date_param]["end_date(#{key}i)"].to_i end - params[:q].delete([@@date_param]) - - if @@klass == DateTime - @begin_range = @@klass.new(*start_date,0,0,0) rescue nil - @end_range = @@klass.new(*end_date,23,59,59) rescue nil - else - @begin_range = @@klass.new(*start_date) rescue nil - @end_range = @@klass.new(*end_date) rescue nil + params[:q].delete([@@date_param]) + + if @@klass == DateTime + @begin_range = @@klass.new(*start_date,0,0,0) rescue nil + @end_range = @@klass.new(*end_date,23,59,59) rescue nil + else + @begin_range = @@klass.new(*start_date) rescue nil + @end_range = @@klass.new(*end_date) rescue nil end end diff --git a/app/views/time_tables/_filter.html.slim b/app/views/time_tables/_filter.html.slim index a4d90d1cc..2672f7dfc 100644 --- a/app/views/time_tables/_filter.html.slim +++ b/app/views/time_tables/_filter.html.slim @@ -15,8 +15,8 @@ = f.label Chouette::TimeTable.human_attribute_name(:bounding_dates), required: false, class: 'control-label' .filter_menu = f.simple_fields_for :bounding_dates do |p| - = f.input :start_date, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true - = f.input :end_date, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true + = p.input :start_date, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true + = p.input :end_date, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date smart_date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true .actions |