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

[#2750] Validate order on model update rather than on usage

Browse source
This commit is contained in:
Frederic Merizen 2018-10-05 15:31:24 +02:00
parent 026c322fce
commit 58c0ec1bbd
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/models/procedure_presentation.rb
View file

@ -10,6 +10,7 @@ class ProcedurePresentation < ApplicationRecord
validate :check_allowed_displayed_fields
validate :check_allowed_sort_column
validate :check_allowed_sort_order
validate :check_allowed_filter_columns
def fields
@ -63,7 +64,6 @@ class ProcedurePresentation < ApplicationRecord
table = sort['table']
column = sanitized_column(sort)
order = sort['order']
assert_valid_order(order)
case table
when 'notifications'
@ -151,6 +151,13 @@ class ProcedurePresentation < ApplicationRecord
end
end
def check_allowed_sort_order
order = sort['order']
if !["asc", "desc"].include?(order)
errors.add(:sort, "#{order} n’est pas une ordre permis")
end
end
def check_allowed_filter_columns
filters.each do |_, columns|
columns.each do |column|
@ -207,12 +214,6 @@ class ProcedurePresentation < ApplicationRecord
@column_whitelist[table] || []
end
def assert_valid_order(order)
if !["asc", "desc"].include?(order)
raise "Invalid order #{order}"
end
end
def sanitized_column(field)
table = field['table']
table = ActiveRecord::Base.connection.quote_column_name((table == 'self' ? 'dossier' : table).pluralize)