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

[#3477] Do not use string interpolation for where_equals

Browse source
This commit is contained in:
Frederic Merizen 2019-02-26 16:57:51 +01:00 committed by Frederic Merizen
parent 3c96c2e83d
commit 91e6671cfb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/procedure_presentation.rb
View file

@ -125,7 +125,7 @@ class ProcedurePresentation < ApplicationRecord
dates = values.map { |v| v.to_date rescue nil }
Filter.new(
dossiers.includes(table)
).where_equals(table_column, dates)
).where_equals(table, column, dates)
else
Filter.new(
dossiers
@ -164,7 +164,7 @@ class ProcedurePresentation < ApplicationRecord
end
Filter.new(dossiers)
.where_equals('champs.type_de_champ_id', fields.pluck('column'))
.where_equals(:champ, :type_de_champ_id, fields.pluck('column'))
end
end
end
@ -191,8 +191,8 @@ class ProcedurePresentation < ApplicationRecord
@dossiers.where(q, *(values.map { |value| "%#{value}%" }))
end
def where_equals(table_column, values)
@dossiers.where("#{table_column} IN (?)", values)
def where_equals(table, column, values)
@dossiers.where(table.to_s.pluralize => { column => values })
end
end