diff options
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/workbenches/_filters.html.slim | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index 58fd507d4..ecf70805d 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -66,7 +66,9 @@ class WorkbenchesController < BreadcrumbController if begin_range > end_range flash.now[:error] = t('referentials.errors.validity_period') else - scope = scope.in_periode(begin_range..end_range) + scope = scope.in_periode(begin_range..end_range) + @begin_range = begin_range + @end_range = end_range end scope end diff --git a/app/views/workbenches/_filters.html.slim b/app/views/workbenches/_filters.html.slim index 7a962f927..5700b2eca 100644 --- a/app/views/workbenches/_filters.html.slim +++ b/app/views/workbenches/_filters.html.slim @@ -23,8 +23,8 @@ = f.label @wbench_refs.human_attribute_name(:validity_period), required: false, class: 'control-label' .filter_menu = f.simple_fields_for :validity_period do |p| - = p.input :begin_gteq, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date filter_menu-item' }, include_blank: true - = p.input :end_lteq, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date filter_menu-item' }, include_blank: true + = p.input :begin_gteq, as: :date, label: t('simple_form.from'), wrapper_html: { class: 'date filter_menu-item' }, default: @begin_range, include_blank: @begin_range ? false : true + = p.input :end_lteq, as: :date, label: t('simple_form.to'), wrapper_html: { class: 'date filter_menu-item' }, default: @end_range, include_blank: @end_range ? false : true .actions = link_to 'Effacer', @workbench, class: 'btn btn-link' |