From 2c1e1db37db69c38a3bbee00cc4b02f3bd3d99f7 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 14 Mar 2019 18:07:19 +0100 Subject: [PATCH] [Fix #3617] 404 when filter[value] contains a "." --- app/views/new_gestionnaire/procedures/show.html.haml | 2 +- config/routes.rb | 2 +- spec/features/new_gestionnaire/procedure_filters_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index c9a897c11..c10fa3b8a 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -66,7 +66,7 @@ - if i > 0 ou %span.filter - = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column'], value: filter['value']) do + = link_to remove_filter_gestionnaire_procedure_path(@procedure, { statut: @statut, table: filter['table'], column: filter['column'], value: filter['value'] }) do %img.close-icon{ src: image_url("close.svg") } = "#{filter['label'].truncate(50)} : #{filter['value']}" %table.table.dossiers-table.hoverable diff --git a/config/routes.rb b/config/routes.rb index 764d04eae..3a9bc9966 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -313,7 +313,7 @@ Rails.application.routes.draw do patch 'update_displayed_fields' get 'update_sort/:table/:column' => 'procedures#update_sort', as: 'update_sort' post 'add_filter' - get 'remove_filter/:statut/:table/:column/:value' => 'procedures#remove_filter', as: 'remove_filter' + get 'remove_filter' => 'procedures#remove_filter', as: 'remove_filter' get 'download_dossiers' get 'email_notifications' patch 'update_email_notifications' diff --git a/spec/features/new_gestionnaire/procedure_filters_spec.rb b/spec/features/new_gestionnaire/procedure_filters_spec.rb index 2868855c8..8ac88e567 100644 --- a/spec/features/new_gestionnaire/procedure_filters_spec.rb +++ b/spec/features/new_gestionnaire/procedure_filters_spec.rb @@ -115,7 +115,7 @@ feature "procedure filters" do end def remove_filter(filter_value) - find(:xpath, "(//span[contains(@class, 'filter')]/a[contains(@href, '#{URI.encode(filter_value)}')])[1]").click + find(:xpath, "(//span[contains(@class, 'filter')]/a[contains(@href, '#{CGI.escape(filter_value)}')])[1]").click end def add_filter(column_name, filter_value)