DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2563 from betagouv/frederic/fix_2562-make_dossier_filter_case_insensitive

Browse source 
Rendre insensibles à la casse les filtres des dossiers sur la page instructeurs
This commit is contained in:
Frederic Merizen 2018-09-13 10:30:07 +02:00 committed by GitHub
commit 279398a849
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/new_gestionnaire/procedures_controller.rb
View file

@ -221,19 +221,19 @@ module NewGestionnaire
current_filters.map do |filter| current_filters.map do |filter|
case filter['table'] case filter['table']
when 'self' when 'self'
dossiers.where("? LIKE ?", filter['column'], "%#{filter['value']}%") dossiers.where("? ILIKE ?", filter['column'], "%#{filter['value']}%")
when 'france_connect_information' when 'france_connect_information'
dossiers dossiers
.includes(user: :france_connect_information) .includes(user: :france_connect_information)
.where("? LIKE ?", "france_connect_informations.#{filter['column']}", "%#{filter['value']}%") .where("? ILIKE ?", "france_connect_informations.#{filter['column']}", "%#{filter['value']}%")
when 'type_de_champ', 'type_de_champ_private' when 'type_de_champ', 'type_de_champ_private'
relation = filter['table'] == 'type_de_champ' ? :champs : :champs_private relation = filter['table'] == 'type_de_champ' ? :champs : :champs_private
dossiers dossiers
.includes(relation) .includes(relation)
.where("champs.type_de_champ_id = ?", filter['column'].to_i) .where("champs.type_de_champ_id = ?", filter['column'].to_i)
.where("champs.value LIKE ?", "%#{filter['value']}%") .where("champs.value ILIKE ?", "%#{filter['value']}%")
when 'entreprise' when 'entreprise'
table = 'etablissement' table = 'etablissement'
if filter['column'] == 'date_creation' if filter['column'] == 'date_creation'
@ -244,12 +244,12 @@ module NewGestionnaire
else else
dossiers dossiers
.includes(table) .includes(table)
.where("#{table.pluralize}.entreprise_#{filter['column']} LIKE ?", "%#{filter['value']}%") .where("#{table.pluralize}.entreprise_#{filter['column']} ILIKE ?", "%#{filter['value']}%")
end end
when 'user', 'etablissement' when 'user', 'etablissement'
dossiers dossiers
.includes(filter['table']) .includes(filter['table'])
.where("#{filter['table'].pluralize}.#{filter['column']} LIKE ?", "%#{filter['value']}%") .where("#{filter['table'].pluralize}.#{filter['column']} ILIKE ?", "%#{filter['value']}%")
end.pluck(:id) end.pluck(:id)
end.reduce(:&) end.reduce(:&)
end end