From 656f0df3773cc33d04526725fcd3dc4a115c9c46 Mon Sep 17 00:00:00 2001 From: Frederic Merizen Date: Mon, 4 Mar 2019 17:21:48 +0100 Subject: [PATCH] [#3477] Remove clunky extra method --- app/models/procedure_presentation.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb index 13c14a557..a41ad8eca 100644 --- a/app/models/procedure_presentation.rb +++ b/app/models/procedure_presentation.rb @@ -171,7 +171,7 @@ class ProcedurePresentation < ApplicationRecord def check_allowed_sort_column table = sort['table'] 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") end end @@ -222,8 +222,9 @@ class ProcedurePresentation < ApplicationRecord } end - def valid_column?(table, column) - valid_columns_for_table(table).include?(column) + def valid_column?(table, column, extra_columns = {}) + valid_columns_for_table(table).include?(column) || + extra_columns[table]&.include?(column) end def valid_columns_for_table(table) @@ -244,8 +245,4 @@ class ProcedurePresentation < ApplicationRecord def dossier_field_service @dossier_field_service ||= DossierFieldService.new end - - def valid_sort_column?(table, column) - valid_column?(table, column) || EXTRA_SORT_COLUMNS[table]&.include?(column) - end end