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

[#3477] Remove clunky extra method

Browse source
This commit is contained in:
Frederic Merizen 2019-03-04 17:21:48 +01:00
parent f64ade355f
commit 656f0df377
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/procedure_presentation.rb
View file

@ -171,7 +171,7 @@ class ProcedurePresentation < ApplicationRecord
def check_allowed_sort_column def check_allowed_sort_column
table = sort['table'] table = sort['table']
column = sort['column'] column = sort['column']
if !valid_sort_column?(table, column) if !valid_column?(table, column, EXTRA_SORT_COLUMNS)
errors.add(:sort, "#{table}.#{column} n’est pas une colonne permise") errors.add(:sort, "#{table}.#{column} n’est pas une colonne permise")
end end
end end
@ -222,8 +222,9 @@ class ProcedurePresentation < ApplicationRecord
} }
end end
def valid_column?(table, column) def valid_column?(table, column, extra_columns = {})
valid_columns_for_table(table).include?(column) valid_columns_for_table(table).include?(column) ||
extra_columns[table]&.include?(column)
end end
def valid_columns_for_table(table) def valid_columns_for_table(table)
@ -244,8 +245,4 @@ class ProcedurePresentation < ApplicationRecord
def dossier_field_service def dossier_field_service
@dossier_field_service ||= DossierFieldService.new @dossier_field_service ||= DossierFieldService.new
end end
def valid_sort_column?(table, column)
valid_column?(table, column) || EXTRA_SORT_COLUMNS[table]&.include?(column)
end
end end