mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-02 13:12:13 +08:00
fix Rails 5.1 bug with params
This commit is contained in:
parent
0774b6f7e6
commit
dc68b3068b
1 changed files with 10 additions and 2 deletions
|
@ -189,7 +189,7 @@ class SamplesController < ApplicationController
|
|||
end
|
||||
|
||||
# Add all newly added sample fields
|
||||
params[:custom_fields].to_a.each do |id, val|
|
||||
custom_fields_params.to_a.each do |id, val|
|
||||
# Check if client is lying (SCF shouldn't exist)
|
||||
scf = SampleCustomField.where("custom_field_id = ? AND sample_id = ?", id, sample.id).take
|
||||
|
||||
|
@ -227,7 +227,7 @@ class SamplesController < ApplicationController
|
|||
|
||||
scf_to_delete = []
|
||||
# Update all existing custom values
|
||||
params[:sample_custom_fields].to_a.each do |id, val|
|
||||
sample_custom_fields_params.to_a.each do |id, val|
|
||||
scf = SampleCustomField.find_by_id(id)
|
||||
|
||||
if scf
|
||||
|
@ -323,6 +323,14 @@ class SamplesController < ApplicationController
|
|||
)
|
||||
end
|
||||
|
||||
def custom_fields_params
|
||||
params.permit(custom_fields: {}).to_h[:custom_fields]
|
||||
end
|
||||
|
||||
def sample_custom_fields_params
|
||||
params.permit(sample_custom_fields: {}).to_h[:sample_custom_fields]
|
||||
end
|
||||
|
||||
def sample_annotation_notification(sample, scf, old_text = nil)
|
||||
table_url = params.fetch(:request_url) { :request_url_must_be_present }
|
||||
smart_annotation_notification(
|
||||
|
|
Loading…
Reference in a new issue